holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-28 01:28:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #790 from koriaf/master

Browse Source 
fix<migrations>: correct import of b64decode in migration 0020
This commit is contained in:
Garret Wassermann 2019-12-17 20:45:09 -05:00 committed by GitHub
commit 909ecc400b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/migrations/0020_depickle_user_settings.py
View File

@ -9,7 +9,12 @@ def unpickle_settings(settings_pickled):
import pickle import pickle
except ImportError: except ImportError:
import cPickle as pickle 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: try:
return pickle.loads(b64decode(settings_pickled.encode('utf-8'))) return pickle.loads(b64decode(settings_pickled.encode('utf-8')))
except Exception: except Exception: