Ticket #7676: threadsafe_serializers.diff

django/core/serializers/__init__.py

@@ -34 +34 @@
 
 _serializers = {}
 
-def register_serializer(format, serializer_module):
+def register_serializer(serializers, format, serializer_module):
     """Register a new serializer by passing in a module name."""
     module = __import__(serializer_module, {}, {}, [''])
-    _serializers[format] = module
+    serializers[format] = module
 
 def unregister_serializer(format):
     """Unregister a given serializer"""
@@ -88 +88 @@
     that user code has a chance to (e.g.) set up custom settings without
     needing to be careful of import order.
     """
+    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