gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gisattic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 5 deletions

diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index a84206a0fe..97e5bc9b26 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -3,14 +3,13 @@ Serialize data to/from JSON
 """
 
 import datetime
-from django.utils import simplejson
+from StringIO import StringIO
+
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 from django.utils import datetime_safe
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+from django.utils import simplejson
+
 try:
     import decimal
 except ImportError: