--- a/web/lib/django/core/serializers/__init__.py Wed May 19 17:43:59 2010 +0200
+++ b/web/lib/django/core/serializers/__init__.py Tue May 25 02:43:45 2010 +0200
@@ -36,14 +36,14 @@
_serializers = {}
def register_serializer(format, serializer_module, serializers=None):
- """"Register a new serializer.
-
+ """"Register a new serializer.
+
``serializer_module`` should be the fully qualified module name
for the serializer.
-
+
If ``serializers`` is provided, the registration will be added
to the provided dictionary.
-
+
If ``serializers`` is not provided, the registration will be made
directly into the global register of serializers. Adding serializers
directly is not a thread-safe operation.
@@ -53,7 +53,7 @@
_serializers[format] = module
else:
serializers[format] = module
-
+
def unregister_serializer(format):
"Unregister a given serializer. This is not a thread-safe operation."
del _serializers[format]
@@ -87,7 +87,7 @@
s.serialize(queryset, **options)
return s.getvalue()
-def deserialize(format, stream_or_string):
+def deserialize(format, stream_or_string, **options):
"""
Deserialize a stream or a string. Returns an iterator that yields ``(obj,
m2m_relation_dict)``, where ``obj`` is a instantiated -- but *unsaved* --
@@ -95,7 +95,7 @@
list_of_related_objects}``.
"""
d = get_deserializer(format)
- return d(stream_or_string)
+ return d(stream_or_string, **options)
def _load_serializers():
"""