Mercurial > public > madeira
changeset 89:b7cdfdde3999
For Django 1.5: replace django's simplejson with json.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Tue, 27 Aug 2013 19:53:31 -0500 |
| parents | 978a08c838d8 |
| children | 447d75d1e21d |
| files | articles/management/commands/import_old_articles.py band/management/commands/import_old_band.py email_list/management/commands/import_old_email_list.py madeira/settings/base.py mp3/management/commands/import_old_mp3.py news/management/commands/import_old_news.py videos/management/commands/import_old_videos.py |
| diffstat | 7 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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,
--- 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()
--- 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], '..'))
--- 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
--- 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
--- 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