Merge pull request #790 from koriaf/master

fix<migrations>: correct import of b64decode in migration 0020
django-helpdesk · Dec 18, 2019 · 909ecc4 · 909ecc4
2 parents b6e9a2c + 015b226
commit 909ecc4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/helpdesk/migrations/0020_depickle_user_settings.py b/helpdesk/migrations/0020_depickle_user_settings.py
@@ -9,7 +9,12 @@ def unpickle_settings(settings_pickled):
         import pickle
     except ImportError:
         import cPickle as pickle
-    from helpdesk.lib import b64decode
+    try:
+        # Python 2 support
+        from base64 import urlsafe_b64decode as b64decode
+    except ImportError:
+        # Python 3 support
+        from base64 import decodebytes as b64decode
     try:
         return pickle.loads(b64decode(settings_pickled.encode('utf-8')))
     except Exception: