Changeset 6893

Timestamp:

12/04/07 15:35:28 (1 year ago)

Author:

jacob

Message:

Fixed a bug introduced in [6891]: the "safe" YAML serializer can't handle time types out of the box. I've worked around the bug by coercing times to strings,
which is far from perfect. However, it's better than a Python-specific "!!python/time" type which would break interoperability (which was the goal of switching to the safe mode in the first place).

Files:

• django/trunk/django/core/serializers/pyyaml.py (modified) (2 diffs)

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

@@ -6 +6 @@
-
-import datetime
+from django.db import models
-from django.core.serializers.python import Serializer as PythonSerializer
-from django.core.serializers.python import Deserializer as PythonDeserializer
@@ -18 +19 @@
-    Convert a queryset to YAML.
-    """
+    
+    def handle_field(self, obj, field):
+        # A nasty special case: base YAML doesn't support serialization of time
+        # types (as opposed to dates or datetimes, which it does support). Since
+        # we want to use the "safe" serializer for better interoperability, we
+        # need to do something with those pesky times. Converting 'em to strings
+        # isn't perfect, but it's better than a "!!python/time" type which would
+        # halt deserialization under any other language.
+        if isinstance(field, models.TimeField) and getattr(obj, field.name) is not None:
+            self._current[field.name] = str(getattr(obj, field.name))
+        else:
+            super(Serializer, self).handle_field(obj, field)
+    
-    def end_serialization(self):
-        self.options.pop('stream', None)