Commits

marconius  committed 1214c6c Draft

fix json issue?

  • Participants
  • Parent commits 15d612a

Comments (0)

Files changed (1)

File satchmo/apps/satchmo_utils/json.py

 
 import types
 from django.db import models
-try:
-    from django.utils import simplejson as json
-except ImportError:
-    import simplejson as json
+#try:
+#    from django.utils import simplejson as json
+#except ImportError:
+import simplejson as json
 from django.core.serializers.json import DateTimeAwareJSONEncoder
 from decimal import Decimal
 
 
     ret = _any(data)
 
-    return json.dumps(ret, cls=DateTimeAwareJSONEncoder)
+    #return json.dumps(ret, cls=DateTimeAwareJSONEncoder)
+    return json.dumps(ret, cls=json.JSONEncoder)