From 17406a3929fd17cfb0edc5e22db17e25e480a8bd Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Fri, 31 Oct 2014 18:47:48 +0100
Subject: [PATCH] more python3 fixes

---
 oml/node/cert.py | 12 ++++++------
 oml/update.py    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/oml/node/cert.py b/oml/node/cert.py
index c01d4bd..af9c43a 100644
--- a/oml/node/cert.py
+++ b/oml/node/cert.py
@@ -32,12 +32,12 @@ def generate_ssl():
     ca.set_issuer(ca.get_subject())
     ca.set_pubkey(key)
     ca.add_extensions([
-      OpenSSL.crypto.X509Extension("basicConstraints", True, "CA:TRUE, pathlen:0"),
-      OpenSSL.crypto.X509Extension("nsCertType", True, "sslCA"),
-      OpenSSL.crypto.X509Extension("extendedKeyUsage", True,
-        "serverAuth,clientAuth,emailProtection,timeStamping,msCodeInd,msCodeCom,msCTLSign,msSGC,msEFS,nsSGC"),
-      OpenSSL.crypto.X509Extension("keyUsage", False, "keyCertSign, cRLSign"),
-      OpenSSL.crypto.X509Extension("subjectKeyIdentifier", False, "hash", subject=ca),
+      OpenSSL.crypto.X509Extension(b"basicConstraints", True, b"CA:TRUE, pathlen:0"),
+      OpenSSL.crypto.X509Extension(b"nsCertType", True, b"sslCA"),
+      OpenSSL.crypto.X509Extension(b"extendedKeyUsage", True,
+        b"serverAuth,clientAuth,emailProtection,timeStamping,msCodeInd,msCodeCom,msCTLSign,msSGC,msEFS,nsSGC"),
+      OpenSSL.crypto.X509Extension(b"keyUsage", False, b"keyCertSign, cRLSign"),
+      OpenSSL.crypto.X509Extension(b"subjectKeyIdentifier", False, b"hash", subject=ca),
     ])
     ca.sign(key, "sha1")
     with open(settings.ssl_cert_path, 'wb') as fd:
diff --git a/oml/update.py b/oml/update.py
index 58694d4..b644878 100644
--- a/oml/update.py
+++ b/oml/update.py
@@ -45,7 +45,7 @@ def get(url, filename=None):
             dirname = os.path.dirname(filename)
             if dirname and not os.path.exists(dirname):
                 os.makedirs(dirname)
-            with open(filename, 'w') as fd:
+            with open(filename, 'wb') as fd:
                 data = u.read(4096)
                 while data:
                     fd.write(data)
@@ -54,7 +54,7 @@ def get(url, filename=None):
 def check():
     if settings.release:
         release_data = get(RELEASE_URL)
-        release = json.loads(release_data)
+        release = json.loads(release_data.decode('utf-8'))
         old = settings.release['modules']['openmedialibrary']['version']
         new = release['modules']['openmedialibrary']['version']
         return verify(release) and old < new
@@ -64,7 +64,7 @@ def download():
     if not os.path.exists(os.path.join(settings.config_path, 'release.json')):
         return True
     release_data = get(RELEASE_URL)
-    release = json.loads(release_data)
+    release = json.loads(release_data.decode('utf-8'))
     if verify(release):
         ox.makedirs(settings.updates_path)
         os.chdir(os.path.dirname(settings.base_dir))
@@ -80,7 +80,7 @@ def download():
                         os.unlink(module_tar)
                         return False
                 current_files.add(os.path.basename(module_tar))
-        with open(os.path.join(settings.updates_path, 'release.json'), 'w') as fd:
+        with open(os.path.join(settings.updates_path, 'release.json'), 'wb') as fd:
             fd.write(release_data)
         for f in set(os.walk(settings.updates_path).next()[2])-current_files:
             os.unlink(os.path.join(settings.updates_path, f))