fix: unitest, remove incompatible version, update locale

Author: Agus Makmun

.travis.yml

@@ -23,8 +23,6 @@ matrix:
       env: DJANGO="==3.1.*"
     - python: 3.6
       env: DJANGO="==3.2.*"
-    - python: 3.6
-      env: DJANGO="==4.0"
 
     - python: 3.7
       env: DJANGO="==2.0.*"
@@ -38,8 +36,6 @@ matrix:
       env: DJANGO="==3.1.*"
     - python: 3.7
       env: DJANGO="==3.2.*"
-    - python: 3.7
-      env: DJANGO="==4.0"
 
     - python: 3.8
       env: DJANGO="==2.0.*"
@@ -73,7 +69,7 @@ matrix:
 
     - os: osx
       language: generic
-      env: DJANGO="==4.0"
+      env: DJANGO="==3.2.*"
 
 # Perform the manual steps on OSX to install Python3 and activate venv:
 # Since Python versions have been tested on Linux and it is only a matter of

martor/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-10 08:32+0700\n"
+"POT-Creation-Date: 2021-12-21 20:12+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -179,11 +179,11 @@ msgstr ""
 msgid "Invalid request!"
 msgstr ""
 
-#: views.py:75
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr ""
 
-#: views.py:80
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr ""

martor/locale/id/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-10 08:32+0700\n"
+"POT-Creation-Date: 2021-12-21 20:13+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -181,13 +181,13 @@ msgstr "Bantuan Penggunaan Markdown"
 msgid "Invalid request!"
 msgstr "Permintaan tidak valid"
 
-#: views.py:75
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr ""
 "Tidak ada pengguna terdaftar sebagai `%(username)s` atau pengguna telah "
 "nonaktif."
 
-#: views.py:80
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr "Validasi Gagal untuk field `username`"

martor/locale/tr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-10 08:33+0700\n"
+"POT-Creation-Date: 2021-12-21 20:13+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ozcan Yarimdunya <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -182,11 +182,11 @@ msgstr "Markdown Kılavuzu (Yardım)"
 msgid "Invalid request!"
 msgstr "Geçersiz istek!"
 
-#: views.py:75
+#: views.py:74
 #, python-format
 msgid "No users registered as `%(username)s` or user is unactived."
 msgstr "`%(username)s` kullanıcı kayıtlı değil veya aktif değil"
 
-#: views.py:80
+#: views.py:79
 msgid "Validation Failed for field `username`"
 msgstr "`kullanıcı adı` alanı için doğrulama başarısız"

martor/tests/tests.py

@@ -1,6 +1,6 @@
 from django.test import TestCase, override_settings
 from django.contrib.auth.models import User
-from martor.utils import markdownify, VersionNotCompatible
+from martor.utils import markdownify
 
 
 class SimpleTest(TestCase):
@@ -77,18 +77,6 @@ def test_markdownify(self):
         #     '...fixme'
         # )
 
-    def test_markdownify_error(
-        self,
-    ):
-        # This tests that real errors don't raise VersionNotCompatible
-        #  errors, which could be misleading.
-        try:
-            markdownify(None)
-        except Exception as e:
-            self.assertNotIsInstance(e, VersionNotCompatible)
-        else:
-            self.fail("no assertion raised")
-
     def test_markdownify_xss_handled(self):
         xss_payload = "[aaaa](javascript:alert(1))"
         response = markdownify(xss_payload)

martor/utils.py

@@ -17,10 +17,6 @@
 )
 
 
-class VersionNotCompatible(Exception):
-    pass
-
-
 def markdownify(markdown_text):
     """
     Render the markdown content to HTML.
@@ -32,33 +28,25 @@ def markdownify(markdown_text):
         '<p><img alt="awesome" src="http://i.imgur.com/hvguiSn.jpg" /></p>'
         >>>
     """
-    try:
-        # Strip HTML tags
-        markdown_text = strip_tags(markdown_text)
+    # Strip HTML tags
+    markdown_text = strip_tags(markdown_text)
 
-        # Sanitize Markdown links
-        # https://github.com/netbox-community/netbox/commit/5af2b3c2f577a01d177cb24cda1019551a2a4b64
-        schemes = "|".join(ALLOWED_URL_SCHEMES)
-        pattern = fr"\[(.+)\]\((?!({schemes})).*:(.+)\)"
-        markdown_text = re.sub(
-            pattern,
-            "[\\1](\\3)",
-            markdown_text,
-            flags=re.IGNORECASE,
-        )
+    # Sanitize Markdown links
+    # https://github.com/netbox-community/netbox/commit/5af2b3c2f577a01d177cb24cda1019551a2a4b64
+    schemes = "|".join(ALLOWED_URL_SCHEMES)
+    pattern = fr"\[(.+)\]\((?!({schemes})).*:(.+)\)"
+    markdown_text = re.sub(
+        pattern,
+        "[\\1](\\3)",
+        markdown_text,
+        flags=re.IGNORECASE,
+    )
 
-        return markdown.markdown(
-            markdown_text,
-            extensions=MARTOR_MARKDOWN_EXTENSIONS,
-            extension_configs=MARTOR_MARKDOWN_EXTENSION_CONFIGS,
-        )
-    except TypeError as e:
-        if "extendMarkdown" not in str(e):
-            raise
-        raise VersionNotCompatible(
-            "The markdown isn't compatible, please reinstall "
-            "your python markdown into Markdown>=3.0"
-        )
+    return markdown.markdown(
+        markdown_text,
+        extensions=MARTOR_MARKDOWN_EXTENSIONS,
+        extension_configs=MARTOR_MARKDOWN_EXTENSION_CONFIGS,
+    )
 
 
 class LazyEncoder(DjangoJSONEncoder):