From 82f9dadc61a91c0e380fe2851da0f3e908fce639 Mon Sep 17 00:00:00 2001
From: agusmakmun <summon.agus@gmail.com>
Date: Sat, 30 Mar 2024 17:48:06 +0700
Subject: [PATCH] feat: support python markdown < 3.6

---
 martor/extensions/del_ins.py     | 10 +++-------
 martor/extensions/emoji.py       |  8 +++++---
 martor/extensions/escape_html.py |  2 +-
 martor/extensions/mdx_video.py   | 17 ++++++++---------
 martor/extensions/mention.py     | 25 +++++++++++++------------
 martor/extensions/urlize.py      | 10 ++++++----
 requirements-dev.txt             |  5 +++++
 requirements.txt                 |  2 +-
 requirements2.txt                | 29 +++++++++++++++++++++++++++++
 9 files changed, 71 insertions(+), 37 deletions(-)
 create mode 100644 requirements-dev.txt
 create mode 100644 requirements2.txt

diff --git a/martor/extensions/del_ins.py b/martor/extensions/del_ins.py
index f50c1aa59..7a79e0231 100644
--- a/martor/extensions/del_ins.py
+++ b/martor/extensions/del_ins.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 """
 Del/Ins Extension for Python-Markdown
 =====================================
@@ -26,11 +24,9 @@
 See LICENSE.md for details.
 """
 
-
 import markdown
 from markdown.inlinepatterns import SimpleTagPattern
 
-
 DEL_RE = r"(\~\~)(.+?)(\~\~)"
 INS_RE = r"(\+\+)(.+?)(\+\+)"
 
@@ -38,11 +34,11 @@
 class DelInsExtension(markdown.extensions.Extension):
     """Adds del_ins extension to Markdown class."""
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md: markdown.core.Markdown, *args):
         del_tag = SimpleTagPattern(DEL_RE, "del")
         ins_tag = SimpleTagPattern(INS_RE, "ins")
-        md.inlinePatterns.add("del", del_tag, "<not_strong")
-        md.inlinePatterns.add("ins", ins_tag, "<not_strong")
+        md.inlinePatterns.register(del_tag, "del", 10)
+        md.inlinePatterns.register(ins_tag, "ins", 11)
 
 
 def makeExtension(*args, **kwargs):
diff --git a/martor/extensions/emoji.py b/martor/extensions/emoji.py
index 3f6efd148..a31539e11 100644
--- a/martor/extensions/emoji.py
+++ b/martor/extensions/emoji.py
@@ -1,3 +1,5 @@
+from xml.etree import ElementTree
+
 import markdown
 
 from ..settings import MARTOR_MARKDOWN_BASE_EMOJI_URL as EMOJI_URL
@@ -666,7 +668,7 @@ def handleMatch(self, m):
             return emoji
 
         url = "{0}{1}.png".format(EMOJI_URL, emoji.replace(":", ""))
-        el = markdown.util.etree.Element("img")
+        el = ElementTree.Element("img")
         el.set("src", url)
         el.set("class", "marked-emoji")
         el.text = markdown.util.AtomicString(emoji)
@@ -674,9 +676,9 @@ def handleMatch(self, m):
 
 
 class EmojiExtension(markdown.Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md: markdown.core.Markdown, *args):
         """Setup `emoji_img` with EmojiPattern"""
-        md.inlinePatterns["emoji_img"] = EmojiPattern(EMOJI_RE, md)
+        md.inlinePatterns.register(EmojiPattern(EMOJI_RE, md), "emoji_img", 12)
 
 
 def makeExtension(*args, **kwargs):
diff --git a/martor/extensions/escape_html.py b/martor/extensions/escape_html.py
index 7df839b26..51443d82b 100644
--- a/martor/extensions/escape_html.py
+++ b/martor/extensions/escape_html.py
@@ -2,7 +2,7 @@
 
 
 class EscapeHtml(markdown.Extension):
-    def extendMarkdown(self, md):
+    def extendMarkdown(self, md: markdown.core.Markdown, *args):
         md.preprocessors.deregister("html_block")
         md.inlinePatterns.deregister("html")
 
diff --git a/martor/extensions/mdx_video.py b/martor/extensions/mdx_video.py
index 53aa03cf5..794d1f557 100644
--- a/martor/extensions/mdx_video.py
+++ b/martor/extensions/mdx_video.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
+from xml.etree import ElementTree
 
 import markdown
-from markdown.util import etree
 
 
 class VideoExtension(markdown.Extension):
@@ -29,13 +28,13 @@ def __init__(self, **kwargs):
         for key, value in kwargs.items():
             self.setConfig(key, str(value))
 
-    def add_inline(self, md, name, klass, re):
+    def add_inline(self, md: markdown.core.Markdown, name: str, klass: type, re: str):
         pattern = klass(re)
         pattern.md = md
         pattern.ext = self
-        md.inlinePatterns.add(name, pattern, "<reference")
+        md.inlinePatterns.register(pattern, name, 15)
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md, *args):
         self.add_inline(
             md,
             "dailymotion",
@@ -131,7 +130,7 @@ def handleMatch(self, m):
 
 
 def render_iframe(url, width, height):
-    iframe = etree.Element("iframe")
+    iframe = ElementTree.Element("iframe")
     iframe.set("width", width)
     iframe.set("height", height)
     iframe.set("src", url)
@@ -141,16 +140,16 @@ def render_iframe(url, width, height):
 
 
 def flash_object(url, width, height):
-    obj = etree.Element("object")
+    obj = ElementTree.Element("object")
     obj.set("type", "application/x-shockwave-flash")
     obj.set("width", width)
     obj.set("height", height)
     obj.set("data", url)
-    param = etree.Element("param")
+    param = ElementTree.Element("param")
     param.set("name", "movie")
     param.set("value", url)
     obj.append(param)
-    param = etree.Element("param")
+    param = ElementTree.Element("param")
     param.set("name", "allowFullScreen")
     param.set("value", "true")
     obj.append(param)
diff --git a/martor/extensions/mention.py b/martor/extensions/mention.py
index a095fe871..b843c29e2 100644
--- a/martor/extensions/mention.py
+++ b/martor/extensions/mention.py
@@ -1,3 +1,5 @@
+from xml.etree import ElementTree
+
 import markdown
 from django.contrib.auth import get_user_model
 
@@ -28,22 +30,21 @@ def handleMatch(self, m):
         )  # noqa: E501
 
         """Makesure `username` is registered and activated."""
-        if MARTOR_ENABLE_CONFIGS["mention"] == "true":
-            if users.exists():
-                url = "{0}{1}/".format(
-                    MARTOR_MARKDOWN_BASE_MENTION_URL, username
-                )  # noqa: E501
-                el = markdown.util.etree.Element("a")
-                el.set("href", url)
-                el.set("class", "direct-mention-link")
-                el.text = markdown.util.AtomicString("@" + username)
-                return el
+        if MARTOR_ENABLE_CONFIGS["mention"] == "true" and users.exists():
+            url = "{0}{1}/".format(
+                MARTOR_MARKDOWN_BASE_MENTION_URL, username
+            )  # noqa: E501
+            el = ElementTree.Element("a")
+            el.set("href", url)
+            el.set("class", "direct-mention-link")
+            el.text = markdown.util.AtomicString("@" + username)
+            return el
 
 
 class MentionExtension(markdown.Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md: markdown.core.Markdown, *args):
         """Setup `mention_link` with MentionPattern"""
-        md.inlinePatterns["mention_link"] = MentionPattern(MENTION_RE, md)
+        md.inlinePatterns.register(MentionPattern(MENTION_RE, md), "mention_link", 13)
 
 
 def makeExtension(*args, **kwargs):
diff --git a/martor/extensions/urlize.py b/martor/extensions/urlize.py
index 2ddc362e6..05312ffdf 100644
--- a/martor/extensions/urlize.py
+++ b/martor/extensions/urlize.py
@@ -37,6 +37,8 @@
 
 """
 
+from xml.etree import ElementTree
+
 import markdown
 
 # Global Vars
@@ -61,13 +63,13 @@ def handleMatch(self, m):
 
         text = url
 
-        if not url.split("://")[0] in ("http", "https", "ftp"):
+        if url.split("://")[0] not in ("http", "https", "ftp"):
             if "@" in url and "/" not in url:
                 url = "mailto:" + url
             else:
                 url = "http://" + url
 
-        el = markdown.util.etree.Element("a")
+        el = ElementTree.Element("a")
         el.set("href", url)
         el.text = markdown.util.AtomicString(text)
         return el
@@ -76,9 +78,9 @@ def handleMatch(self, m):
 class UrlizeExtension(markdown.Extension):
     """Urlize Extension for Python-Markdown."""
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md: markdown.core.Markdown, *args):
         """Replace autolink with UrlizePattern"""
-        md.inlinePatterns["autolink"] = UrlizePattern(URLIZE_RE, md)
+        md.inlinePatterns.register(UrlizePattern(URLIZE_RE, md), "autolink", 14)
 
 
 def makeExtension(*args, **kwargs):
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 000000000..e1d945ea4
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+
+isort
+black
+flake8
diff --git a/requirements.txt b/requirements.txt
index 86a353183..50aefba63 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 urllib3<2 ; python_version < '3.7' # urllib3 2.0 dropped support for Python 3.6
 zipp<3.7 ; python_version < '3.7' # zipp 3.7.0 dropped support for Python 3.6
 Django>=3.2, <=5.0.3
-Markdown<3.4
+Markdown<3.6
 requests
 bleach
 tzdata
diff --git a/requirements2.txt b/requirements2.txt
new file mode 100644
index 000000000..be8d5212d
--- /dev/null
+++ b/requirements2.txt
@@ -0,0 +1,29 @@
+asgiref==3.8.1
+black==24.3.0
+bleach==6.1.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+click==8.1.7
+Django==4.2.11
+flake8==7.0.0
+idna==3.6
+importlib_metadata==7.1.0
+isort==5.13.2
+Markdown==3.5.2
+martor==1.6.42
+mccabe==0.7.0
+mypy-extensions==1.0.0
+packaging==24.0
+pathspec==0.12.1
+platformdirs==4.2.0
+pycodestyle==2.11.1
+pyflakes==3.2.0
+requests==2.31.0
+six==1.16.0
+sqlparse==0.4.4
+tomli==2.0.1
+typing_extensions==4.10.0
+tzdata==2024.1
+urllib3==2.2.1
+webencodings==0.5.1
+zipp==3.18.1