summaryrefslogtreecommitdiff
path: root/ishtar_common/widgets.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-14 22:18:33 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-14 22:18:33 +0200
commitc39b64da645dae6440cb6fbba7f828c903072276 (patch)
tree1d8550c9401b75ef2f58cd52b864c8ded3e8a52c /ishtar_common/widgets.py
parentceb93508265e053fa8db3734731a275912f2e7c5 (diff)
downloadIshtar-c39b64da645dae6440cb6fbba7f828c903072276.tar.bz2
Ishtar-c39b64da645dae6440cb6fbba7f828c903072276.zip
Django 1.8: formtools is now an external lib - trick to make pisa use new version of reportlab
Diffstat (limited to 'ishtar_common/widgets.py')
-rw-r--r--ishtar_common/widgets.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index b0f28a6cf..b00cad3d8 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -34,7 +34,7 @@ from django.utils.encoding import smart_unicode
from django.utils.functional import lazy
from django.utils.html import escape
from django.utils.safestring import mark_safe
-from django.utils.simplejson import JSONEncoder
+from json import JSONEncoder
from django.utils.translation import ugettext_lazy as _
from ishtar_common import models