extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-17 11:21:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Testing quicktest.py

Browse Source
This commit is contained in:
Garret Wassermann
2018-01-11 02:19:49 -05:00
parent 31b49ab2f6
commit 75f54dd233
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
helpdesk/models.py
View File

@ -1131,7 +1131,10 @@ class UserSettings(models.Model):
from helpdesk.lib import b64decode
try:
if six.PY3:
return pickle.loads(b64decode(bytes(self.settings_pickled, 'utf8')))
if type(self.settings_pickled) is bytes:
return pickle.loads(b64decode(str(self.settings_pickled, 'utf8')))
else:
return pickle.loads(b64decode(bytes(self.settings_pickled, 'utf8')))
else:
return pickle.loads(b64decode(str(self.settings_pickled)))
except pickle.UnpicklingError: