Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

applied the patch from andieluijk to fix #2 (simplejson import error)

  • Loading branch information...
commit be1d1afb2bb4c728b99a72a8565d3becea9e388a 1 parent c39627b
Arne Brodowski arneb authored
Showing with 9 additions and 3 deletions.
  1. +4 −1 campaign/admin.py
  2. +5 −2 campaign/forms.py
5 campaign/admin.py
View
@@ -10,7 +10,10 @@
from django.utils.translation import ugettext as _
from django.utils.encoding import force_unicode
from django.utils.safestring import mark_safe
-from django.utils.simplejson import simplejson as json
+try:
+ from django.utils.simplejson import simplejson as json
+except ImportError:
+ from django.utils import simplejson as json
from campaign.models import MailTemplate, Subscriber, Campaign, BlacklistEntry, BounceEntry, SubscriberList
from campaign.forms import UploadForm
7 campaign/forms.py
View
@@ -1,8 +1,11 @@
import csv
from django import forms
-from django.utils.simplejson import simplejson as json
from django.utils.translation import ugettext as _
-
+try:
+ from django.utils.simplejson import simplejson as json
+except ImportError:
+ from django.utils import simplejson as json
+
class UploadForm(forms.Form):
"""
validates that the uploaded file contains parseable json data.
Please sign in to comment.
Something went wrong with that request. Please try again.