default settings

pandora/annotaion/models.py

@@ -15,11 +15,11 @@ from django.db import models
 from django.db.models import Q
 from django.contrib.auth.models import User
 from django.core.files.base import ContentFile
-from django.utils import simplejson as json
 from django.conf import settings
 
 from ox.django import fields
 import ox
+from ox.utils import json
 from ox import stripTags
 from ox.normalize import canonicalTitle, canonicalName
 

pandora/user/models.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
+from datetime import datetime
 
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import signals
 from django.dispatch import dispatcher
-from django.utils import simplejson as json
+from django.conf import settings
-from datetime import datetime
 
+from ox.utils import json
 
 class UserProfile(models.Model):
     recover_key = models.TextField()