Fix issue with base64 and python2/3

abraia/config.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import base64
 
 API_URL = 'https://api.abraia.me'
@@ -15,6 +16,17 @@
               'psd': 'image/vnd.adobe.photoshop'}
 
 
+def base64encode(str):
+    str = str.encode('utf-8') if sys.version_info[0] == 3 else str
+    str = base64.b64encode(str)
+    return str.decode('ascii') if isinstance(str, bytes) else str
+
+
+def base64decode(str):
+    str = base64.b64decode(str)
+    return str.decode('ascii') if isinstance(str, bytes) else str
+
+
 def load_auth():
     abraia_key = os.environ.get('ABRAIA_KEY')
     if os.path.isfile(CONFIG_FILE) and (abraia_key is None):
@@ -25,7 +37,7 @@ def load_auth():
                 config[key] = value
         return config['abraia_api_key'], config['abraia_api_secret']
     elif abraia_key:
-        api_key, api_secret = base64.b64decode(abraia_key).split(':')
+        api_key, api_secret = base64decode(abraia_key).split(':')
         return api_key, api_secret
     return '', ''
 

scripts/abraia

@@ -5,11 +5,12 @@ from builtins import input
 import os
 import sys
 import shutil
-import base64
 import argparse
 from tqdm import tqdm
 from datetime import datetime
 
+from abraia.config import base64encode, base64decode
+
 import abraia
 
 IMAGE_EXTS = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.psd']
@@ -21,10 +22,11 @@ def process_info():
 
 def process_configure():
     api_key, api_secret = abraia.config.load_auth()
-    abraia_key = '{}:{}'.format(api_key, api_secret).encode('base64') if api_key and api_secret else ''
+    abraia_key = base64encode(
+        '{}:{}'.format(api_key, api_secret)) if api_key and api_secret else ''
     key = input('Abraia Key [{}]: '.format(abraia_key))
     abraia_key = abraia_key if key == '' else key
-    api_key, api_secret = base64.b64decode(abraia_key).split(':')
+    api_key, api_secret = base64decode(abraia_key).split(':')
     abraia.config.save_auth(api_key, api_secret)