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, 3 insertions, 5 deletions

diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index 58cf59bed9..ac77166a2f 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -4,14 +4,12 @@ YAML serializer.
 Requires PyYaml (http://pyyaml.org/), but that's checked for in __init__.
 """
 
+from StringIO import StringIO
+import yaml
+
 from django.db import models
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-import yaml
 
 class Serializer(PythonSerializer):
     """