From 7f342c72f64594775bac1bcce81b32ae9e18e6ac Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Wed, 19 Mar 2014 16:44:34 +0200 Subject: Continue to port GMG codebase. --- mediagoblin/tools/crypto.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/tools/crypto.py') diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py index 917e674c..14a1a72d 100644 --- a/mediagoblin/tools/crypto.py +++ b/mediagoblin/tools/crypto.py @@ -52,7 +52,7 @@ def load_key(filename): def create_key(key_dir, key_filepath): global __itsda_secret - old_umask = os.umask(077) + old_umask = os.umask(0o77) key_file = None try: if not os.path.isdir(key_dir): @@ -80,7 +80,7 @@ def setup_crypto(): key_filepath = os.path.join(key_dir, 'itsdangeroussecret.bin') try: load_key(key_filepath) - except IOError, error: + except IOError as error: if error.errno != errno.ENOENT: raise create_key(key_dir, key_filepath) -- cgit v1.2.3 From cda3055bd6d1810b17a83cde991c7e059ef76657 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Thu, 7 Aug 2014 13:08:42 +0300 Subject: Fix another tests. (forgot to commit earlier) --- mediagoblin/tools/crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/tools/crypto.py') diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py index 14a1a72d..cf6d31f6 100644 --- a/mediagoblin/tools/crypto.py +++ b/mediagoblin/tools/crypto.py @@ -61,7 +61,7 @@ def create_key(key_dir, key_filepath): key = str(getrandbits(192)) key_file = tempfile.NamedTemporaryFile(dir=key_dir, suffix='.bin', delete=False) - key_file.write(key) + key_file.write(key.encode('ascii')) key_file.flush() os.rename(key_file.name, key_filepath) key_file.close() -- cgit v1.2.3