Removed some Py2.4-2.6 specific code.

x0x1x0x · Jan 12, 2018 · d4de20b · d4de20b
1 parent 1127013
commit d4de20b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py
@@ -24,12 +24,6 @@
 from ..util import isBlockLevel
 import re
 
-try:
-    Scanner = re.Scanner
-except AttributeError:  # pragma: no cover
-    # must be on Python 2.4
-    from sre import Scanner
-
 
 def _handle_double_quote(s, t):
     k, v = t.split('=', 1)
@@ -53,7 +47,7 @@ def _handle_word(s, t):
     return t, t
 
 
-_scanner = Scanner([
+_scanner = re.Scanner([
     (r'[^ =]+=".*?"', _handle_double_quote),
     (r"[^ =]+='.*?'", _handle_single_quote),
     (r'[^ =]+=[^ =]+', _handle_key_value),

diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py
@@ -229,19 +229,6 @@ def unescape(self, text):
         except KeyError:  # pragma: no cover
             return text
 
-        def itertext(el):  # pragma: no cover
-            ' Reimplement Element.itertext for older python versions '
-            tag = el.tag
-            if not isinstance(tag, util.string_type) and tag is not None:
-                return
-            if el.text:
-                yield el.text
-            for e in el:
-                for s in itertext(e):
-                    yield s
-                if e.tail:
-                    yield e.tail
-
         def get_stash(m):
             id = m.group(1)
             if id in stash:
@@ -250,7 +237,7 @@ def get_stash(m):
                     return value
                 else:
                     # An etree Element - return text content only
-                    return ''.join(itertext(value))
+                    return ''.join(value.itertext())
         return util.INLINE_PLACEHOLDER_RE.sub(get_stash, text)