Changeset 8215 for django/branches/gis/django/core/serializers

Timestamp:

08/05/08 12:15:33 (5 months ago)

Author:

jbronn

Message:

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.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/core/serializers/base.py (modified) (1 diff)
• django/branches/gis/django/core/serializers/json.py (modified) (1 diff)
• django/branches/gis/django/core/serializers/pyyaml.py (modified) (1 diff)

django/branches/gis/django/core/serializers/base.py

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

django/branches/gis/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/branches/gis/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):