Ticket #7676: threadsafe_serializers-same_public_api.diff

django/core/serializers/__init__.py

@@ -35 +35 @@
 _serializers = {}
 
 def register_serializer(format, serializer_module):
-    """Register a new serializer by passing in a module name."""
-    module = __import__(serializer_module, {}, {}, [''])
-    _serializers[format] = module
+    """Register a new serializer by passing in a module name.
+    Not thread-safe."""
+    _register_serializer(_serializers, format, serializer_module)
 
 def unregister_serializer(format):
-    """Unregister a given serializer"""
+    """Unregister a given serializer. Not thread-safe."""
     del _serializers[format]
 
 def get_serializer(format):
+    """Thread-safe."""
     if not _serializers:
         _load_serializers()
     return _serializers[format].Serializer
 
 def get_serializer_formats():
+    """Thread-safe."""
     if not _serializers:
         _load_serializers()
     return _serializers.keys()
 
 def get_public_serializer_formats():
+    """Thread-safe."""
     if not _serializers:
         _load_serializers()
     return [k for k, v in _serializers.iteritems() if not v.Serializer.internal_use_only]
 
 def get_deserializer(format):
+    """Thread-safe."""
     if not _serializers:
         _load_serializers()
     return _serializers[format].Deserializer
@@ -67 +71 @@
     """
     Serialize a queryset (or any iterator that returns database objects) using
     a certain serializer.
+    Thread-safe.
     """
     s = get_serializer(format)()
     s.serialize(queryset, **options)
@@ -78 +83 @@
     m2m_relation_dict)``, where ``obj`` is a instantiated -- but *unsaved* --
     object, and ``m2m_relation_dict`` is a dictionary of ``{m2m_field_name :
     list_of_related_objects}``.
+    Thread-safe.
     """
     d = get_deserializer(format)
     return d(stream_or_string)
@@ -87 +93 @@
     Register built-in and settings-defined serializers. This is done lazily so
     that user code has a chance to (e.g.) set up custom settings without
     needing to be careful of import order.
+    Thread-safe.
     """
+    global _serializers
+    serializers = {}
     for format in BUILTIN_SERIALIZERS:
-        register_serializer(format, BUILTIN_SERIALIZERS[format])
+        _register_serializer(serializers, format, BUILTIN_SERIALIZERS[format])
     if hasattr(settings, "SERIALIZATION_MODULES"):
         for format in settings.SERIALIZATION_MODULES:
-            register_serializer(format, settings.SERIALIZATION_MODULES[format])
+            _register_serializer(serializers, format,
+                    settings.SERIALIZATION_MODULES[format])
+    _serializers = serializers
+
+def _register_serializer(serializers, format, serializer_module):
+    """Register a new serializer by passing in a module name."""
+    module = __import__(serializer_module, {}, {}, [''])
+    serializers[format] = module