# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1377651211 18000
# Node ID b7cdfdde399935163030f47213c7335618861d7a
# Parent  978a08c838d85cf8d1ef9e5fc65b1ab5d8853c1e
For Django 1.5: replace django's simplejson with json.

diff -r 978a08c838d8 -r b7cdfdde3999 articles/management/commands/import_old_articles.py
--- a/articles/management/commands/import_old_articles.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/articles/management/commands/import_old_articles.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,10 +4,10 @@
 
 """
 import datetime
+import json
 
 from django.conf import settings
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
 from django.utils.html import linebreaks
 import textile
 
diff -r 978a08c838d8 -r b7cdfdde3999 band/management/commands/import_old_band.py
--- a/band/management/commands/import_old_band.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/band/management/commands/import_old_band.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,10 +4,9 @@
 
 """
 import datetime
+import json
 
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
-from django.utils.html import linebreaks
 from photologue.models import Photo
 
 from band.models import (Member, Gear, RecordLabel, Album, AlbumTrack,
diff -r 978a08c838d8 -r b7cdfdde3999 email_list/management/commands/import_old_email_list.py
--- a/email_list/management/commands/import_old_email_list.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/email_list/management/commands/import_old_email_list.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,9 +4,9 @@
 
 """
 import datetime
+import json
 
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
 
 from email_list.models import Subscriber
 
@@ -48,4 +48,4 @@
                 status_date=datetime.datetime.strptime(
                     fields['status_date'], '%Y-%m-%d'))
 
-        subscriber.save()                    
+        subscriber.save()
diff -r 978a08c838d8 -r b7cdfdde3999 madeira/settings/base.py
--- a/madeira/settings/base.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/madeira/settings/base.py	Tue Aug 27 19:53:31 2013 -0500
@@ -1,7 +1,7 @@
 # Base Django settings for madeira project.
 
 import os
-import django.utils.simplejson as json
+import json
 
 PROJECT_PATH = os.path.abspath(os.path.join(os.path.split(__file__)[0], '..'))
 
diff -r 978a08c838d8 -r b7cdfdde3999 mp3/management/commands/import_old_mp3.py
--- a/mp3/management/commands/import_old_mp3.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/mp3/management/commands/import_old_mp3.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,9 +4,9 @@
 
 """
 import datetime
+import json
 
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
 from django.utils.html import linebreaks
 
 from mp3.models import Collection, Song
diff -r 978a08c838d8 -r b7cdfdde3999 news/management/commands/import_old_news.py
--- a/news/management/commands/import_old_news.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/news/management/commands/import_old_news.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,10 +4,10 @@
 
 """
 import datetime
+import json
 
 from django.conf import settings
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
 from django.utils.html import linebreaks
 import textile
 
diff -r 978a08c838d8 -r b7cdfdde3999 videos/management/commands/import_old_videos.py
--- a/videos/management/commands/import_old_videos.py	Sat Apr 13 16:04:09 2013 -0500
+++ b/videos/management/commands/import_old_videos.py	Tue Aug 27 19:53:31 2013 -0500
@@ -4,9 +4,9 @@
 
 """
 import datetime
+import json
 
 from django.core.management.base import LabelCommand
-from django.utils import simplejson as json
 from django.utils.html import linebreaks
 
 from videos.models import Collection, Video