Django 1.8: formtools is now an external lib - trick to make pisa use new version of reportlab

3 files changed, 7 insertions, 3 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index f185576ea..316e3e9d5 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -23,7 +23,11 @@ from copy import copy
 import csv
 import cStringIO as StringIO
 import datetime
+
+import reportlab
+reportlab.Version = "2.2"  # stupid hack for an old library...
 import ho.pisa as pisa
+
 import json
 import logging
 from markdown import markdown
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
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 8d787d733..bf567bebb 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -22,8 +22,8 @@ import logging
 # from functools import wraps
 
 from django.conf import settings
-from django.contrib.formtools.wizard.views import NamedUrlWizardView, \
-    normalize_name, get_storage, StepsHelper
+from formtools.wizard.views import NamedUrlWizardView, normalize_name, \
+    get_storage, StepsHelper
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.images import ImageFile