Mercurial > public > madeira

diff mp3/management/commands/import_old_mp3.py @ 89:b7cdfdde3999

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e2868ad47a1e
children
line wrap: on
line diff
--- 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