Upgrade to Python 3

rophako/jsondb.py

@@ -66,7 +66,7 @@ def commit(document, data):
             segment = "/".join(directory)
             if len(segment) > 0 and not os.path.isdir(segment):
                 logger.debug("JsonDB: mkdir {}".format(segment))
-                os.mkdir(segment, 0755)
+                os.mkdir(segment, 0o755)
 
     # Update the cached document.
     set_cache(document, data, expires=cache_lifetime)

rophako/log.py

@@ -2,6 +2,8 @@
 
 """Debug and logging functions."""
 
+from __future__ import print_function
+
 from flask import g, request
 import logging
 
@@ -18,7 +20,7 @@ class LogHandler(logging.Handler):
         name = "-nobody-"
 
         line = line.replace('$prefix$', '')
-        print line
+        print(line)
 
 # Set up the logger.
 logger = logging.getLogger("rophako")

rophako/model/blog.py

@@ -40,7 +40,7 @@ def get_index():
 
     # Hide any private posts if we aren't logged in.
     if not g.info["session"]["login"]:
-        for post_id, data in db.iteritems():
+        for post_id, data in db.items():
             if data["privacy"] == "private":
                 del db[post_id]
 
@@ -53,7 +53,7 @@ def get_categories():
 
     # Group by tags.
     tags = {}
-    for post, data in index.iteritems():
+    for post, data in index.items():
         for tag in data["categories"]:
             if not tag in tags:
                 tags[tag] = 0
@@ -110,7 +110,7 @@ def post_entry(post_id, fid, epoch, author, subject, avatar, categories,
         while True:
             collision = False
 
-            for k, v in index.iteritems():
+            for k, v in index.items():
                 # Skip the same post, for updates.
                 if k == post_id: continue
 
@@ -191,7 +191,7 @@ def resolve_id(fid):
             return None
 
     # It's a friendly ID. Scan for it.
-    for post_id, data in index.iteritems():
+    for post_id, data in index.items():
         if data["fid"] == fid:
             return int(post_id)
 

rophako/model/comment.py

@@ -8,6 +8,7 @@ import hashlib
 import urllib
 import random
 import re
+import sys
 
 import config
 import rophako.jsondb as JsonDB
@@ -207,7 +208,7 @@ def write_subscribers(thread, subs):
 def random_hash():
     """Get a short random hash to use as the ID for a comment."""
     md5 = hashlib.md5()
-    md5.update(str(random.randint(0, 1000000)))
+    md5.update(str(random.randint(0, 1000000)).encode("utf-8"))
     return md5.hexdigest()
 
 
@@ -223,7 +224,13 @@ def gravatar(email):
         }
         if default:
             params["d"] = default
-        url = "//www.gravatar.com/avatar/" + hashlib.md5(email.lower()).hexdigest() + "?"
+        url = "//www.gravatar.com/avatar/" + hashlib.md5(email.lower().encode("utf-8")).hexdigest() + "?"
+
+        # URL encode the params, the Python 2 & Python 3 way.
+        if sys.version_info[0] < 3:
             url += urllib.urlencode(params)
+        else:
+            url += urllib.parse.urlencode(params)
+
         return url
     return ""

rophako/model/emoticons.py

@@ -46,7 +46,7 @@ def load_theme():
 
     try:
         data = json.loads(text)
-    except Exception, e:
+    except Exception as e:
         logger.error("Couldn't load JSON from emoticon file: {}".format(e))
         data = {}
 

rophako/model/photo.py

@@ -536,5 +536,5 @@ def random_name(filetype):
 def random_hash():
     """Get a short random hash to use as the base name for a photo."""
     md5 = hashlib.md5()
-    md5.update(str(random.randint(0, 1000000)))
+    md5.update(str(random.randint(0, 1000000)).encode("utf-8"))
     return md5.hexdigest()[:8]

rophako/model/user.py

@@ -147,7 +147,7 @@ def exists(uid=None, username=None):
 
 
 def hash_password(password):
-    return bcrypt.hashpw(str(password), bcrypt.gensalt(config.BCRYPT_ITERATIONS))
+    return bcrypt.hashpw(str(password).encode("utf-8"), bcrypt.gensalt(config.BCRYPT_ITERATIONS)).decode("utf-8")
 
 
 def check_auth(username, password):
@@ -163,7 +163,8 @@ def check_auth(username, password):
     db = get_user(username=username)
 
     # Check the password.
-    return bcrypt.hashpw(str(password), str(db["password"])) == db["password"]
+    test = bcrypt.hashpw(str(password).encode("utf-8"), str(db["password"]).encode("utf-8")).decode("utf-8")
+    return test == db["password"]
 
 
 def get_next_uid():

rophako/modules/account.py

@@ -37,7 +37,7 @@ def login():
 
             # Redirect them to a local page?
             url = request.form.get("url", "")
-            if url[0] == "/":
+            if url.startswith("/"):
                 return redirect(url)
 
             return redirect(url_for("index"))

rophako/modules/blog.py

@@ -68,7 +68,7 @@ def entry(fid):
     # Inject information about this post's siblings.
     index = Blog.get_index()
     siblings = [None, None] # previous, next
-    sorted_ids = map(lambda y: int(y), sorted(index.keys(), key=lambda x: index[x]["time"], reverse=True))
+    sorted_ids = list(map(lambda y: int(y), sorted(index.keys(), key=lambda x: index[x]["time"], reverse=True)))
     for i in range(0, len(sorted_ids)):
         if sorted_ids[i] == post_id:
             # Found us!
@@ -195,7 +195,7 @@ def update():
                     g.info["min"],
                     g.info["sec"],
                 )
-            except ValueError, e:
+            except ValueError as e:
                 invalid = True
                 flash("Invalid date/time: " + str(e))
 
@@ -364,7 +364,7 @@ def partial_index():
     # Are we narrowing by category?
     if category:
         # Narrow down the index to just those that match the category.
-        for post_id, data in index.iteritems():
+        for post_id, data in index.items():
             if not category in data["categories"]:
                 continue
             pool[post_id] = data
@@ -445,7 +445,7 @@ def get_index_posts(index):
     """Helper function to get data for the blog index page."""
     # Separate the sticky posts from the normal ones.
     sticky, normal = set(), set()
-    for post_id, data in index.iteritems():
+    for post_id, data in index.items():
         if data["sticky"]:
             sticky.add(post_id)
         else: