4 files changed, 7 insertions(+), 6 deletions(-)

M src/wiki/core/markdown/mdx/responsivetable.py
M src/wiki/plugins/links/mdx/djangowikilinks.py
M src/wiki/plugins/links/mdx/urlize.py
M src/wiki/plugins/macros/mdx/wikilinks.py

@@ 1,6 1,6 @@
+from xml.etree import ElementTree as etree
 import markdown
 from markdown.treeprocessors import Treeprocessor
-from markdown.util import etree
 
 
 class ResponsiveTableExtension(markdown.Extension):

@@ 17,9 17,9 @@ Dependencies:
 * [Markdown 2.6+](https://pypi.python.org/pypi/Markdown)
 """
 from os import path as os_path
+from xml.etree import ElementTree as etree
 
 import markdown
-from markdown.util import etree
 from wiki import models
 
 

@@ 1,5 1,5 @@
 import re
-
+from xml.etree import ElementTree as etree
 import markdown
 
 # Regular expression is meant to match the following pattern:


@@ 138,11 138,11 @@ class UrlizePattern(markdown.inlinepatterns.Pattern):
             return url
 
         # Convenience link to distinguish external links more easily.
-        icon = markdown.util.etree.Element("span")
+        icon = etree.Element("span")
         icon.set("class", "fa fa-external-link")
 
         # Link text.
-        span_text = markdown.util.etree.Element("span")
+        span_text = etree.Element("span")
         span_text.text = markdown.util.AtomicString(" " + text)
 
         # Set-up link itself.

@@ 2,6 2,7 @@
 Extend the shipped Markdown extension 'wikilinks'
 """
 import re
+from xml.etree import ElementTree as etree
 
 import markdown
 from django.urls import reverse


@@ 49,7 50,7 @@ class WikiLinks(wikilinks.WikiLinksInlineProcessor):
         base_url, end_url, html_class = self._getMeta()
         label = m.group(1).strip()
         url = self.config["build_url"](label, base_url, end_url, self.md)
-        a = markdown.util.etree.Element("a")
+        a = etree.Element("a")
         a.text = label
         a.set("href", url)
         if html_class: