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

Fixing unit tests for python3 for custom staff filters

Browse Source
This commit is contained in:
Garret Wassermann
2017-10-30 05:07:44 -04:00
parent 27ee01449e
commit 6e2a16e5a6
5 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
helpdesk/models.py
View File

@@ -17,6 +17,7 @@ from django.utils import timezone
from django.utils.translation import ugettext_lazy as _, ugettext
from django.utils.encoding import python_2_unicode_compatible
import six
@python_2_unicode_compatible
class Queue(models.Model):
@@ -1118,7 +1119,10 @@ class UserSettings(models.Model):
import cPickle as pickle
from helpdesk.lib import b64decode
try:
return pickle.loads(b64decode(str(self.settings_pickled)))
if six.PY3:
return pickle.loads(b64decode(bytes(self.settings_pickled, 'utf8')))
else:
return pickle.loads(b64decode(str(self.settings_pickled)))
except pickle.UnpicklingError:
return {}