Changeset 8151

Timestamp:

07/30/08 05:40:37 (4 months ago)

Author:

russellm

Message:

Fixed #7990 -- Modified serializers to use StringIO, rather than cStringIO, due to potential unicode issues.

Files:

• django/trunk/django/core/serializers/base.py (modified) (1 diff)
• django/trunk/django/core/serializers/json.py (modified) (1 diff)
• django/trunk/django/core/serializers/pyyaml.py (modified) (1 diff)

django/trunk/django/core/serializers/base.py

@@ -3 +3 @@
-"""
-
-
-
-
-
+
+
-from django.db import models
-from django.utils.encoding import smart_str, smart_unicode

django/trunk/django/core/serializers/json.py

@@ -4 +4 @@
-
-import datetime
-
+
+
-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:
-    import decimal

django/trunk/django/core/serializers/pyyaml.py

@@ -5 +5 @@
-"""
-
+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):