diff options
| -rw-r--r-- | ishtar_common/views.py | 4 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 2 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 4 | ||||
| -rw-r--r-- | requirements.txt | 4 |
4 files changed, 10 insertions, 4 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 diff --git a/requirements.txt b/requirements.txt index 44018a33d..98122296f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,8 @@ django-extra-views==0.2.4 beautifulsoup4==4.3.2 markdown==2.5.1 --e git+https://github.com/treyhunner/django-simple-history.git@f2f23e67d3f0e9d3be391d0842a160e5a32b26f7#egg=1.8.2 +django-formtools==1.0 + +-e git+https://github.com/treyhunner/django-simple-history.git@1.8.2#egg=django-simple-history django-extensions==1.3.10 |