diff --git a/jet/dashboard/models.py b/jet/dashboard/models.py index cf43c30c..d6a6c435 100644 --- a/jet/dashboard/models.py +++ b/jet/dashboard/models.py @@ -1,7 +1,7 @@ from importlib import import_module import json from django.db import models -from django.utils.encoding import python_2_unicode_compatible +from six import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from jet.utils import LazyDateTimeEncoder diff --git a/jet/models.py b/jet/models.py index 8fe97564..254e892e 100644 --- a/jet/models.py +++ b/jet/models.py @@ -1,6 +1,6 @@ from django.db import models from django.utils import timezone -from django.utils.encoding import python_2_unicode_compatible +from six import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ diff --git a/jet/tests/models.py b/jet/tests/models.py index 6af5272a..5e9ef0e6 100644 --- a/jet/tests/models.py +++ b/jet/tests/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.encoding import python_2_unicode_compatible +from six import python_2_unicode_compatible @python_2_unicode_compatible diff --git a/setup.py b/setup.py index 1cf51df6..f53c1e20 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def read(fname): def get_install_requires(): - install_requires = ['Django'] + install_requires = ['Django', 'six'] try: import importlib