Permalink
Browse files

fixed simplejson import for django trunk

  • Loading branch information...
1 parent db46aae commit 76093f1460479543b17d664815369481e5935e31 @arneb arneb committed Feb 20, 2009
Showing with 2 additions and 2 deletions.
  1. +1 −1 campaign/admin.py
  2. +1 −1 campaign/forms.py
View
2 campaign/admin.py
@@ -9,7 +9,7 @@
from django.utils.translation import ugettext as _
from django.utils.encoding import force_unicode
from django.utils.safestring import mark_safe
-from django.utils import simplejson as json
+from django.utils.simplejson import simplejson as json
from campaign.models import MailTemplate, Subscriber, Campaign, BlacklistEntry, BounceEntry
from campaign.forms import UploadForm
View
2 campaign/forms.py
@@ -1,5 +1,5 @@
from django import forms
-from django.utils import simplejson as json
+from django.utils.simplejson import simplejson as json
from django.utils.translation import ugettext as _
class UploadForm(forms.Form):

0 comments on commit 76093f1

Please sign in to comment.