Removed Python2 support.

This commit removes all Python2-isms from the code.

Author: venthur

CONTRIBUTORS.txt

@@ -52,3 +52,4 @@ Maximilian Hils (github.com/mhils)
 BarkeH (github.com/BarkeH)
 cav71 (github.com/cav71)
 Crozzers (github.com/Crozzers)
+Bastian Venthur (https://github.com/venthur), removed Python2 support

TODO.txt

@@ -1,4 +1,3 @@
-- py3: py2.4 test (broken?)
 - add "smarty-pants" extra to wiki
 - add "html-classes" extra to wiki
 - more on the "code-color" extra wiki page

lib/markdown2.py

@@ -111,22 +111,6 @@
 import codecs
 from collections import defaultdict
 
-
-# ---- Python version compat
-
-# Use `bytes` for byte strings and `unicode` for unicode strings (str in Py3).
-if sys.version_info[0] <= 2:
-    py3 = False
-    try:
-        bytes
-    except NameError:
-        bytes = str
-    base_string_type = basestring
-elif sys.version_info[0] >= 3:
-    py3 = True
-    unicode = str
-    base_string_type = str
-
 # ---- globals
 
 DEBUG = False
@@ -315,9 +299,9 @@ def convert(self, text):
         # articles):
         self.reset()
 
-        if not isinstance(text, unicode):
+        if not isinstance(text, str):
             # TODO: perhaps shouldn't presume UTF-8 for string input?
-            text = unicode(text, 'utf-8')
+            text = str(text, 'utf-8')
 
         if self.use_file_vars:
             # Look for emacs-style file variable hints.
@@ -1611,7 +1595,7 @@ def header_id_from_text(self, text, prefix, n):
             the TOC (if the "toc" extra is specified).
         """
         header_id = _slugify(text)
-        if prefix and isinstance(prefix, base_string_type):
+        if prefix and isinstance(prefix, str):
             header_id = prefix + '-' + header_id
 
         self._count_from_header_id[header_id] += 1
@@ -2485,7 +2469,7 @@ def indent():
     return '\n'.join(lines) + '\n'
 
 
-class UnicodeWithAttrs(unicode):
+class UnicodeWithAttrs(str):
     """A subclass of unicode used for the return value of conversion to
     possibly attach some attributes. E.g. the "toc_html" attribute when
     the "toc" extra is used.
@@ -2565,8 +2549,8 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
     """
     DEBUG = False
     if DEBUG:
-        print("dedent: dedent(..., tabsize=%d, skip_first_line=%r)"\
-              % (tabsize, skip_first_line))
+        print(("dedent: dedent(..., tabsize=%d, skip_first_line=%r)"\
+              % (tabsize, skip_first_line)))
     margin = None
     for i, line in enumerate(lines):
         if i == 0 and skip_first_line: continue
@@ -2582,12 +2566,12 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
                 break
         else:
             continue  # skip all-whitespace lines
-        if DEBUG: print("dedent: indent=%d: %r" % (indent, line))
+        if DEBUG: print(("dedent: indent=%d: %r" % (indent, line)))
         if margin is None:
             margin = indent
         else:
             margin = min(margin, indent)
-    if DEBUG: print("dedent: margin=%r" % margin)
+    if DEBUG: print(("dedent: margin=%r" % margin))
 
     if margin is not None and margin > 0:
         for i, line in enumerate(lines):
@@ -2599,16 +2583,16 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
                 elif ch == '\t':
                     removed += tabsize - (removed % tabsize)
                 elif ch in '\r\n':
-                    if DEBUG: print("dedent: %r: EOL -> strip up to EOL" % line)
+                    if DEBUG: print(("dedent: %r: EOL -> strip up to EOL" % line))
                     lines[i] = lines[i][j:]
                     break
                 else:
                     raise ValueError("unexpected non-whitespace char %r in "
                                      "line %r while removing %d-space margin"
                                      % (ch, line, margin))
                 if DEBUG:
-                    print("dedent: %r: %r -> removed %d/%d"\
-                          % (line, ch, removed, margin))
+                    print(("dedent: %r: %r -> removed %d/%d"\
+                          % (line, ch, removed, margin)))
                 if removed == margin:
                     lines[i] = lines[i][j+1:]
                     break
@@ -2860,23 +2844,15 @@ def main(argv=None):
             p.stdin.write(text.encode('utf-8'))
             p.stdin.close()
             perl_html = p.stdout.read().decode('utf-8')
-            if py3:
-                sys.stdout.write(perl_html)
-            else:
-                sys.stdout.write(perl_html.encode(
-                    sys.stdout.encoding or "utf-8", 'xmlcharrefreplace'))
+            sys.stdout.write(perl_html)
             print("==== markdown2.py ====")
         html = markdown(text,
             html4tags=opts.html4tags,
             safe_mode=opts.safe_mode,
             extras=extras, link_patterns=link_patterns,
             use_file_vars=opts.use_file_vars,
             cli=True)
-        if py3:
-            sys.stdout.write(html)
-        else:
-            sys.stdout.write(html.encode(
-                sys.stdout.encoding or "utf-8", 'xmlcharrefreplace'))
+        sys.stdout.write(html)
         if extras and "toc" in extras:
             log.debug("toc_html: " +
                 str(html.toc_html.encode(sys.stdout.encoding or "utf-8", 'xmlcharrefreplace')))
@@ -2890,7 +2866,7 @@ def main(argv=None):
             else:
                 norm_html = html
                 norm_perl_html = perl_html
-            print("==== match? %r ====" % (norm_perl_html == norm_html))
+            print(("==== match? %r ====" % (norm_perl_html == norm_html)))
 
 
 if __name__ == "__main__":

perf/gen_perf_cases.py

@@ -16,7 +16,7 @@
 def gen_aspn_cases(limit=0):
     base_dir = TMP+'aspn-cases'
     if exists(base_dir):
-        print "'%s' exists, skipping" % base_dir
+        print("'%s' exists, skipping" % base_dir)
         return 
     os.makedirs(base_dir)
     sys.stdout.write("generate %s" % base_dir); sys.stdout.flush()
@@ -49,10 +49,10 @@ def gen_aspn_cases(limit=0):
 def gen_test_cases():
     base_dir = TMP+"test-cases"
     if exists(base_dir):
-        print "'%s' exists, skipping" % base_dir
+        print("'%s' exists, skipping" % base_dir)
         return 
     os.makedirs(base_dir)
-    print "generate %s" % base_dir
+    print("generate %s" % base_dir)
     for test_cases_dir in glob(join("..", "test", "*-cases")):
         for text_file in glob(join(test_cases_dir, "*.text")):
             shutil.copy(text_file, join(base_dir, basename(text_file)))
@@ -137,7 +137,7 @@ def _markdown_from_aspn_html(html):
         try:
             idx = markdown.index(marker)
         except ValueError:
-            print "marker: %r" % marker
+            print("marker: %r" % marker)
             raise
         if not markdown[:idx].strip():
             #TODO: Correct this false diagnosis. Problem is not limited
@@ -194,8 +194,8 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
     """
     DEBUG = False
     if DEBUG: 
-        print "dedent: dedent(..., tabsize=%d, skip_first_line=%r)"\
-              % (tabsize, skip_first_line)
+        print("dedent: dedent(..., tabsize=%d, skip_first_line=%r)"\
+              % (tabsize, skip_first_line))
     indents = []
     margin = None
     for i, line in enumerate(lines):
@@ -212,12 +212,12 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
                 break
         else:
             continue # skip all-whitespace lines
-        if DEBUG: print "dedent: indent=%d: %r" % (indent, line)
+        if DEBUG: print("dedent: indent=%d: %r" % (indent, line))
         if margin is None:
             margin = indent
         else:
             margin = min(margin, indent)
-    if DEBUG: print "dedent: margin=%r" % margin
+    if DEBUG: print("dedent: margin=%r" % margin)
 
     if margin is not None and margin > 0:
         for i, line in enumerate(lines):
@@ -229,16 +229,16 @@ def _dedentlines(lines, tabsize=8, skip_first_line=False):
                 elif ch == '\t':
                     removed += tabsize - (removed % tabsize)
                 elif ch in '\r\n':
-                    if DEBUG: print "dedent: %r: EOL -> strip up to EOL" % line
+                    if DEBUG: print("dedent: %r: EOL -> strip up to EOL" % line)
                     lines[i] = lines[i][j:]
                     break
                 else:
                     raise ValueError("unexpected non-whitespace char %r in "
                                      "line %r while removing %d-space margin"
                                      % (ch, line, margin))
                 if DEBUG:
-                    print "dedent: %r: %r -> removed %d/%d"\
-                          % (line, ch, removed, margin)
+                    print("dedent: %r: %r -> removed %d/%d"\
+                          % (line, ch, removed, margin))
                 if removed == margin:
                     lines[i] = lines[i][j+1:]
                     break

perf/perf.py

@@ -45,7 +45,7 @@ def time_markdown_py(cases_dir, repeat):
                 pass
         end = clock()
         times.append(end - start)
-    print "  markdown.py: best of %d: %.3fs" % (repeat, min(times))
+    print("  markdown.py: best of %d: %.3fs" % (repeat, min(times)))
 
 @hotshotit
 def hotshot_markdown2_py(cases_dir, repeat):
@@ -66,7 +66,7 @@ def time_markdown2_py(cases_dir, repeat):
             markdowner.convert(content)
         end = clock()
         times.append(end - start)
-    print "  markdown2.py: best of %d: %.3fs" % (repeat, min(times))
+    print("  markdown2.py: best of %d: %.3fs" % (repeat, min(times)))
 
 def time_markdown_pl(cases_dir, repeat):
     times = []
@@ -75,7 +75,7 @@ def time_markdown_pl(cases_dir, repeat):
         os.system('perl time_markdown_pl.pl "%s"' % cases_dir)
         end = clock()
         times.append(end - start)
-    print "  Markdown.pl: best of %d: %.3fs" % (repeat, min(times))
+    print("  Markdown.pl: best of %d: %.3fs" % (repeat, min(times)))
 
 def time_all(cases_dir, repeat):
     time_markdown_pl(cases_dir, repeat=repeat)
@@ -131,10 +131,10 @@ def main(args=sys.argv):
         if timer_name not in d:
             raise ValueError("no '%s' timer function" % timer_name)
         timer = d[timer_name]
-        print "Profile conversion of %s (plat=%s):" \
-              % (os.path.join(cases_dir, "*.text"), sys.platform)
+        print("Profile conversion of %s (plat=%s):" \
+              % (os.path.join(cases_dir, "*.text"), sys.platform))
         timer(cases_dir, repeat=opts.repeat)
-        print
+        print()
         os.system("python show_stats.py %s.prof" % timer_name)
 
     else:
@@ -145,8 +145,8 @@ def main(args=sys.argv):
         if timer_name not in d:
             raise ValueError("no '%s' timer function" % timer_name)
         timer = d[timer_name]
-        print "Time conversion of %s (plat=%s):" \
-              % (os.path.join(cases_dir, "*.text"), sys.platform)
+        print("Time conversion of %s (plat=%s):" \
+              % (os.path.join(cases_dir, "*.text"), sys.platform))
         timer(cases_dir, repeat=opts.repeat)
 
 if __name__ == "__main__":

perf/strip_cookbook_data.py

@@ -7,11 +7,11 @@ def doit():
     recipes_path = expanduser("recipes.pprint")
     recipe_dicts = eval(open(recipes_path).read())
     for r in recipe_dicts:
-        for key in r.keys():
+        for key in list(r.keys()):
             if key not in ('desc', 'comments'):
                 del r[key]
         for c in r['comments']:
-            for key in c.keys():
+            for key in list(c.keys()):
                 if key not in ('comment', 'title'):
                     del c[key]
 

perf/util.py

@@ -38,14 +38,14 @@ def wrapper(*args, **kw):
             return func(*args, **kw)
         finally:
             total_time = clock() - start_time
-            print "%s took %.3fs" % (func.func_name, total_time)
+            print("%s took %.3fs" % (func.__name__, total_time))
     return wrapper
 
 def hotshotit(func):
     def wrapper(*args, **kw):
         import hotshot
         global hotshotProfilers
-        prof_name = func.func_name+".prof"
+        prof_name = func.__name__+".prof"
         profiler = hotshotProfilers.get(prof_name)
         if profiler is None:
             profiler = hotshot.Profile(prof_name)

sandbox/wiki.py

@@ -18,4 +18,4 @@
 ]
 processor = markdown2.Markdown(extras=["link-patterns"],
                                link_patterns=link_patterns)
-print processor.convert(wiki_page)
+print(processor.convert(wiki_page))