port to python3 but keep py2 compatibility

input/index.md

@@ -28,7 +28,7 @@ start_date = datetime(1994,1,22,0,0)
 end_date = datetime.now()
 difference_in_years = date_as_float(end_date) - date_as_float(start_date)
 
-print int(difference_in_years)
+print(int(difference_in_years))
 
 %--> year old software developer from Germany.
 All of my projects are released as free or open-source software on [my Gitea Server](https://git.xythobuz.de/thomas), [my GitHub profile](https://github.com/xythobuz) and here on my website. Have fun!

macros.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import sys
 import re
 import itertools
 import email.utils
@@ -7,11 +8,26 @@ import os.path
 import time
 import codecs
 from datetime import datetime
-import urlparse
 
 DEFAULT_LANG = "en"
 BASE_URL = "https://www.xythobuz.de"
 
+# =============================================================================
+# Python 2/3 hacks
+# =============================================================================
+
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    import urllib
+    import urllib.request
+    def urlparse_foo(link):
+        return urllib.parse.parse_qs(urllib.parse.urlparse(link).query)['v'][0]
+else:
+    import urlparse
+    def urlparse_foo(link):
+        return urlparse.parse_qs(urlparse.urlparse(link).query)['v'][0]
+
 # -----------------------------------------------------------------------------
 # sub page helper macro
 # -----------------------------------------------------------------------------
@@ -30,24 +46,24 @@ def backToParent():
     # print if any parent link found
     if len(posts) > 0:
         p = posts[0]
-        print '<span class="listdesc">[...back to ' + p.title + ' overview](' + p.url + ')</span>'
+        print('<span class="listdesc">[...back to ' + p.title + ' overview](' + p.url + ')</span>')
 
 # -----------------------------------------------------------------------------
 # table helper macro
 # -----------------------------------------------------------------------------
 
 def tableHelper(style, header, content):
-    print "<table>"
+    print("<table>")
     if (header != None) and (len(header) == len(style)):
-        print "<tr>"
+        print("<tr>")
         for h in header:
-            print "<th>" + h + "</th>"
-        print "</tr>"
+            print("<th>" + h + "</th>")
+        print("</tr>")
     for ci in range(0, len(content)):
         if len(content[ci]) != len(style):
             # invalid call of table helper!
             continue
-        print "<tr>"
+        print("<tr>")
         for i in range(0, len(style)):
             s = style[i]
             td_style = ""
@@ -70,17 +86,17 @@ def tableHelper(style, header, content):
             if td_style != "":
                 td_args = " style=\"" + td_style + "\""
 
-            print "<td" + td_args + ">"
+            print("<td" + td_args + ">")
 
             if isinstance(content[ci][i], tuple):
                 text, link = content[ci][i]
-                print "<a href=\"" + link + "\">" + text + "</a>"
+                print("<a href=\"" + link + "\">" + text + "</a>")
             else:
                 text = content[ci][i]
-                print text
-            print "</td>"
-        print "</tr>"
-    print "</table>"
+                print(text)
+            print("</td>")
+        print("</tr>")
+    print("</table>")
 
 # -----------------------------------------------------------------------------
 # menu helper macro
@@ -112,7 +128,7 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
     if year != lastyear:
         lastyear = year
         if yearsAsHeading:
-            print "\n\n#### %s\n" % (year)
+            print("\n\n#### %s\n" % (year))
 
     dateto = ""
     if p.get("date", "" != ""):
@@ -127,19 +143,19 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
         if nicelyFormatFullDate:
             dateto = " - " + datetime.strptime(p.get("update", p.date), "%Y-%m-%d").strftime("%B %d, %Y")
 
-    print "  * **[%s](%s)**%s" % (title, p.url, dateto)
+    print("  * **[%s](%s)**%s" % (title, p.url, dateto))
 
     if p.get("description", "") != "":
         description = p.get("description", "")
         if lang != "":
             if p.get("description_" + lang, "") != "":
                 description = p.get("description_" + lang, "")
-        print "<br><span class=\"listdesc\">" + description + "</span>"
+        print("<br><span class=\"listdesc\">" + description + "</span>")
 
     if showLastCommit:
         link = githubCommitBadge(p)
         if len(link) > 0:
-            print "<br>" + link
+            print("<br>" + link)
 
     return lastyear
 
@@ -318,14 +334,14 @@ def lightgallery(links):
     for v in videos:
         link, mime, thumb, poster, alt = v
         v_i += 1
-        print '<div style="display:none;" id="video' + str(v_i) + '_' + str(v_ii) + '">'
-        print '<video class="lg-video-object lg-html5" controls preload="none">'
-        print '<source src="' + link + '" type="' + mime + '">'
-        print '<a href="' + link + '">' + alt + '</a>'
-        print '</video>'
-        print '</div>'
+        print('<div style="display:none;" id="video' + str(v_i) + '_' + str(v_ii) + '">')
+        print('<video class="lg-video-object lg-html5" controls preload="none">')
+        print('<source src="' + link + '" type="' + mime + '">')
+        print('<a href="' + link + '">' + alt + '</a>')
+        print('</video>')
+        print('</div>')
         
-    print '<div class="lightgallery">'
+    print('<div class="lightgallery">')
     v_i = -1
     for l in links:
         if (len(l) == 3) or (len(l) == 2):
@@ -337,7 +353,7 @@ def lightgallery(links):
                 link, alt = l
                 if "youtube.com" in link:
                     img = "https://img.youtube.com/vi/"
-                    img += urlparse.parse_qs(urlparse.urlparse(link).query)['v'][0]
+                    img += urlparse_foo(link)
                     img += "/0.jpg" # full size preview
                     #img += "/default.jpg" # default thumbnail
                     style = ' style="width:300px;"'
@@ -346,7 +362,7 @@ def lightgallery(links):
                     x = link.rfind('.')
                     img = link[:x] + '_small' + link[x:]
             lightgallery_check_thumbnail(link, img)
-            print '<div class="border" style="position:relative;" data-src="' + link + '"><a href="' + link + '"><img class="pic" src="' + img + '" alt="' + alt + '"' + style + '>' + img2 + '</a></div>'
+            print('<div class="border" style="position:relative;" data-src="' + link + '"><a href="' + link + '"><img class="pic" src="' + img + '" alt="' + alt + '"' + style + '>' + img2 + '</a></div>')
         elif len(l) == 5:
             v_i += 1
             link, mime, thumb, poster, alt = videos[v_i]
@@ -357,19 +373,19 @@ def lightgallery(links):
                 x = link.rfind('.')
                 poster = link[:x] + '_poster.png'
             lightgallery_check_thumbnail_video(link, thumb, poster)
-            print '<div class="border" data-poster="' + poster + '" data-sub-html="' + alt + '" data-html="#video' + str(v_i) + '_' + str(v_ii) + '"><a href="' + link + '"><img class="pic" src="' + thumb + '"></a></div>'
+            print('<div class="border" data-poster="' + poster + '" data-sub-html="' + alt + '" data-html="#video' + str(v_i) + '_' + str(v_ii) + '"><a href="' + link + '"><img class="pic" src="' + thumb + '"></a></div>')
         else:
             raise NameError('Invalid number of arguments for lightgallery')
-    print '</div>'
+    print('</div>')
 
 # -----------------------------------------------------------------------------
 # github helper macros
 # -----------------------------------------------------------------------------
 
-import urllib, json, sys
+import json, sys
 
 def restRequest(url):
-    response = urllib.urlopen(url)
+    response = urllib.request.urlopen(url) if PY3 else urllib.urlopen(url)
     if response.getcode() != 200:
         sys.stderr.write("\n")
         sys.stderr.write("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")
@@ -430,11 +446,11 @@ def printLatestRelease(user, repo):
     print("</ul></div>")
 
 def include_url(url):
-    response = urllib.urlopen(url)
+    response = urllib.request.urlopen(url) if PY3 else urllib.urlopen(url)
     if response.getcode() != 200:
         raise Exception("invalid response code", response.getcode())
     data = response.read()
-    print data,
+    print(data,)
 
 # -----------------------------------------------------------------------------
 # preconvert hooks
@@ -457,7 +473,7 @@ def hook_preconvert_anotherlang():
                                         [lang.strip() for lang in text_lang[1::2]], \
                                         text_lang[::2]))
 
-        for lang, text in text_grouped.iteritems():
+        for lang, text in (iter(text_grouped.items()) if PY3 else text_grouped.iteritems()):
             spath = p.fname.split(os.path.sep)
             langs.append(lang)
 
@@ -469,19 +485,19 @@ def hook_preconvert_anotherlang():
             vp = Page(filename, virtual=text)
             # Copy real page attributes to the virtual page
             for attr in p:
-                if not vp.has_key(attr):
+                if not ((attr in vp) if PY3 else vp.has_key(attr)):
                     vp[attr] = p[attr]
             # Define a title in the proper language
             vp["title"] = p["title_%s" % lang] \
-                                    if p.has_key("title_%s" % lang) \
+                                    if ((("title_%s" % lang) in p) if PY3 else p.has_key("title_%s" % lang)) \
                                     else p["title"]
             # Keep track of the current lang of the virtual page
             vp["lang"] = lang
             page_vpages[lang] = vp
 
         # Each virtual page has to know about its sister vpages
-        for lang, vpage in page_vpages.iteritems():
-            vpage["lang_links"] = dict([(l, v["url"]) for l, v in page_vpages.iteritems()])
+        for lang, vpage in (iter(page_vpages.items()) if PY3 else page_vpages.iteritems()):
+            vpage["lang_links"] = dict([(l, v["url"]) for l, v in (iter(page_vpages.items()) if PY3 else page_vpages.iteritems())])
             vpage["other_lang"] = langs # set other langs and link
 
         vpages += page_vpages.values()
@@ -719,7 +735,7 @@ def hook_postconvert_size():
             else:
                 return  "<a href=\"%s\">%s</a>&nbsp;(%d Byte)" % (matchobj.group(1), matchobj.group(3), size)
         except:
-            print "Unable to estimate file size for %s" % matchobj.group(1)
+            print("Unable to estimate file size for %s" % matchobj.group(1))
             return '<a href=\"%s\">%s</a>' % (matchobj.group(1), matchobj.group(3))
     _re_url = '<a href=\"([^\"]*?\.(%s))\">(.*?)<\/a>' % file_ext
     for p in pages:

page.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <!--%
 if page.get("lang", "en") == "de":
-    print '<html lang="de">'
+    print('<html lang="de">')
 else:
-    print '<html lang="en">'
+    print('<html lang="en">')
 %-->
 <head>
     <meta charset="{{ htmlspecialchars(__encoding__) }}" />
@@ -29,10 +29,10 @@ else:
 
         if link != "":
             # GitHub Fork-Me Ribbon
-            print '<div class="github-fork-ribbon-wrapper right-bottom">'
-            print '<div class="github-fork-ribbon"><a href="'
-            print link
-            print '">Fork this with Git</a></div></div>'
+            print('<div class="github-fork-ribbon-wrapper right-bottom">')
+            print('<div class="github-fork-ribbon"><a href="')
+            print(link)
+            print('">Fork this with Git</a></div></div>')
     %-->
     <div id="wrap"><div id="nav">
         <ul id="navbar">
@@ -55,11 +55,12 @@ else:
                 <li><a class="inc" href="#"><span class="font-small">A</span><span class="font-big">A</span></a></li>
             </div>
             <!--%
-                tmp = [p for p in page["lang_links"].iteritems()]
+                PY3 = sys.version_info[0] == 3
+                tmp = [p for p in ((iter(page["lang_links"].items())) if PY3 else (page["lang_links"].iteritems()))]
                 if len(tmp) > 1:
-                    print '            <li>'
-                    print " ".join(["<li><a href='%s'>%s</a></li>" % (url, lang) for lang, url in page["lang_links"].iteritems()]).replace(">en<", '><img src="img/en.png" alt="English"><').replace(">de<", '><img src="img/de.png" alt="Deutsch"><')
-                    print "</li>"
+                    print('            <li>')
+                    print(" ".join(["<li><a href='%s'>%s</a></li>" % (url, lang) for lang, url in ((iter(page["lang_links"].items())) if PY3 else (page["lang_links"].iteritems()))]).replace(">en<", '><img src="img/en.png" alt="English"><').replace(">de<", '><img src="img/de.png" alt="Deutsch"><'))
+                    print("</li>")
             %-->
         </ul>
     </div></div>
@@ -69,63 +70,63 @@ else:
 
             if page.get("noheader", "false") == "false":
                 if page.get("title", "") == "Blog":
-                    print "<h1>%s</h1>" % (page.get("post", ""))
+                    print("<h1>%s</h1>" % (page.get("post", "")))
                 else:
                     if page.get("lang", "en") == "de":
-                        print "<h1>%s</h1>" % (page.get("title_de", ""))
+                        print("<h1>%s</h1>" % (page.get("title_de", "")))
                     else:
-                        print "<h1>%s</h1>" % (page.get("title", ""))
+                        print("<h1>%s</h1>" % (page.get("title", "")))
 
                 if page.get("lang", "en") == "de":
                     if page.get("description_de", "") != "":
-                        print "<h5>%s</h5>" % (page.get("description_de", ""))
+                        print("<h5>%s</h5>" % (page.get("description_de", "")))
                     elif page.get("description", "") != "":
-                        print "<h5>%s</h5>" % (page.get("description", ""))
+                        print("<h5>%s</h5>" % (page.get("description", "")))
                 else:
                     if page.get("description", "") != "":
-                        print "<h5>%s</h5>" % (page.get("description", ""))
+                        print("<h5>%s</h5>" % (page.get("description", "")))
 
                 if page.get("date", "") != "":
                     if page.get("title", "") == "Blog":
                         if page.get("lang", "en") == "de":
                             date = datetime.strptime(page["date"], "%Y-%m-%d").strftime("%d.%m.%Y")
-                            print "<i>Ver&ouml;ffentlicht am %s.</i>" % date
+                            print("<i>Ver&ouml;ffentlicht am %s.</i>" % date)
                         else:
                             date = datetime.strptime(page["date"], "%Y-%m-%d").strftime("%B %d, %Y")
-                            print "<i>Published on %s.</i>" % date
+                            print("<i>Published on %s.</i>" % date)
                     else:
                         if page.get("lang", "en") == "de":
                             date = datetime.strptime(page["date"], "%Y-%m-%d").strftime("%d.%m.%Y")
-                            print "<i>Projekt gestartet am %s.</i>" % date
+                            print("<i>Projekt gestartet am %s.</i>" % date)
                         else:
                             date = datetime.strptime(page["date"], "%Y-%m-%d").strftime("%B %d, %Y")
-                            print "<i>Project started on %s.</i>" % date
+                            print("<i>Project started on %s.</i>" % date)
 
                 if page.get("date", "") != "" and page.get("update", "") != "":
-                    print "<br>"
+                    print("<br>")
 
                 if page.get("update", "") != "":
                     if page.get("lang", "en") == "de":
                         date = datetime.strptime(page["update"], "%Y-%m-%d").strftime("%d.%m.%Y")
-                        print "<i>Zuletzt aktualisiert am %s.</i>" % date
+                        print("<i>Zuletzt aktualisiert am %s.</i>" % date)
                     else:
                         date = datetime.strptime(page["update"], "%Y-%m-%d").strftime("%B %d, %Y")
-                        print "<i>Last updated on %s.</i>" % date
+                        print("<i>Last updated on %s.</i>" % date)
 
             link = githubCommitBadge(page, True)
             if len(link) > 0:
-                print "<p>Recent activity on GitHub: " + link + "</p>"
+                print("<p>Recent activity on GitHub: " + link + "</p>")
         %-->
         {{ __content__ }}
         <hr>
         <!--%
             # Comments
             if page.get("comments", "false") == "true":
-                print '<div id="commento"></div>'
-                print '<hr>'
+                print('<div id="commento"></div>')
+                print('<hr>')
             elif page.get("comments", "false") != "false":
-                print '<div style="text-align: center;"><a href="%s">Head over here to discuss this article!</a></div>' % page.get("comments", "false")
-                print '<hr>'
+                print('<div style="text-align: center;"><a href="%s">Head over here to discuss this article!</a></div>' % page.get("comments", "false"))
+                print('<hr>')
         %-->
     </div>
     <div id="footer">
@@ -173,7 +174,7 @@ else:
     <script type="text/javascript" src="js/jquery.min.js"></script>
     <!--%
         if page.get("comments", "false") == "true":
-            print '<script defer src="https://comments.xythobuz.de/js/commento.js"></script>'
+            print('<script defer src="https://comments.xythobuz.de/js/commento.js"></script>')
     %-->
     <script type="text/javascript">
         $(document).ready(function() {

poole.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # =============================================================================
@@ -27,20 +27,14 @@ from __future__ import with_statement
 
 import codecs
 import glob
-import imp
 import optparse
 import os
 from os.path import join as opj
 from os.path import exists as opx
 import re
 import shutil
-import StringIO
 import sys
 import traceback
-import urlparse
-
-from SimpleHTTPServer import SimpleHTTPRequestHandler
-from BaseHTTPServer import HTTPServer
 
 try:
     import markdown
@@ -58,14 +52,39 @@ PY3 = sys.version_info[0] == 3
 if PY3:
     import builtins
     exec_ = getattr(builtins, "exec")
+    import importlib.util
+    import importlib.machinery
+    def imp_load_source(modname, filename):
+        loader = importlib.machinery.SourceFileLoader(modname, filename)
+        spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+        module = importlib.util.module_from_spec(spec)
+        # The module is always executed and not cached in sys.modules.
+        # Uncomment the following line to cache the module.
+        # sys.modules[module.__name__] = module
+        loader.exec_module(module)
+        return module
+    import urllib
+    def urlparse_urljoin(a, b):
+        return urllib.parse.urljoin(a, b)
+    from io import StringIO
+    from http.server import HTTPServer, SimpleHTTPRequestHandler
 else:
     import tempfile
+    from StringIO import StringIO
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+    from BaseHTTPServer import HTTPServer
     def exec_(code, envdic):
         with tempfile.NamedTemporaryFile() as tf:
             tf.write('# -*- coding: utf-8 -*-\n')
             tf.write(code.encode('utf-8'))
             tf.flush()
             execfile(tf.name, envdic)
+    import imp
+    def imp_load_source(module_name, module_path):
+        imp.load_source(module_name, module_path)
+    import urlparse
+    def urlparse_urljoin(a, b):
+        return urlparse.urljoin(a, b)
 
 # =============================================================================
 # init site
@@ -402,7 +421,7 @@ def build(project, opts):
     regx_escp = re.compile(r'\\((?:(?:&lt;|<)!--|{)(?:{|%))') # escaped code
     repl_escp = r'\1'
     regx_rurl = re.compile(r'(?<=(?:(?:\n| )src|href)=")([^#/&%].*?)(?=")')
-    repl_rurl = lambda m: urlparse.urljoin(opts.base_url, m.group(1))
+    repl_rurl = lambda m: urlparse_urljoin(opts.base_url, m.group(1))
 
     regx_eval = re.compile(r'(?<!\\)(?:(?:<!--|{){)(.*?)(?:}(?:-->|}))', re.S)
 
@@ -415,10 +434,14 @@ def build(project, opts):
         except:
             abort_iex(page, "expression", expr, traceback.format_exc())
         else:
-            if not isinstance(repl, basestring): # e.g. numbers
-                repl = unicode(repl)
-            elif not isinstance(repl, unicode):
-                repl = repl.decode("utf-8")
+            if PY3:
+                if not isinstance(repl, str):
+                    repl = str(repl)
+            else:
+                if not isinstance(repl, basestring): # e.g. numbers
+                    repl = unicode(repl)
+                elif not isinstance(repl, unicode):
+                    repl = repl.decode("utf-8")
             return repl
 
     regx_exec = re.compile(r'(?<!\\)(?:(?:<!--|{)%)(.*?)(?:%(?:-->|}))', re.S)
@@ -434,7 +457,7 @@ def build(project, opts):
         stmt = ind_rex.sub('', stmt)
 
         # execute
-        sys.stdout = StringIO.StringIO()
+        sys.stdout = StringIO()
         try:
             exec_(stmt, macros.copy())
         except:
@@ -443,8 +466,9 @@ def build(project, opts):
         else:
             repl = sys.stdout.getvalue()[:-1] # remove last line break
             sys.stdout = sys.__stdout__
-            if not isinstance(repl, unicode):
-                repl = repl.decode(opts.input_enc)
+            if not PY3:
+                if not isinstance(repl, unicode):
+                    repl = repl.decode(opts.input_enc)
             return repl
 
     # -------------------------------------------------------------------------
@@ -473,7 +497,7 @@ def build(project, opts):
 
     # macro module
     fname = opj(opts.project, "macros.py")
-    macros = imp.load_source("macros", fname).__dict__ if opx(fname) else {}
+    macros = imp_load_source("macros", fname).__dict__ if opx(fname) else {}
 
     macros["__encoding__"] = opts.output_enc
     macros["options"] = opts
@@ -495,7 +519,7 @@ def build(project, opts):
     pages = []
     custom_converter = macros.get('converter', {})
 
-    for cwd, dirs, files in os.walk(dir_in.decode(opts.filename_enc)):
+    for cwd, dirs, files in os.walk(dir_in if PY3 else dir_in.decode(opts.filename_enc)):
         cwd_site = cwd[len(dir_in):].lstrip(os.path.sep)
         for sdir in dirs[:]:
             if re.search(opts.ignore, opj(cwd_site, sdir)):
@@ -621,7 +645,7 @@ def removeEmptyFolders(path):
     # if folder empty, delete it
     files = os.listdir(path)
     if len(files) == 0:
-        print "info   : removing empty folder: ", path
+        print("info   : removing empty folder: ", path)
         os.rmdir(path)
 
 # =============================================================================
@@ -666,7 +690,7 @@ def options():
     og.add_option("", "--base-url", default="/", metavar="URL",
                   help="base url for relative links (default: /)")
     og.add_option("" , "--ignore", default=r"^\.|~$", metavar="REGEX",
-                  help="input files to ignore (default: '^\.|~$')")
+                  help="input files to ignore (default: '^\\.|~$')")
     og.add_option("" , "--md-ext", default=[], metavar="EXT",
                   action="append", help="enable a markdown extension")
     og.add_option("", "--input-enc", default="utf-8", metavar="ENC",