Ticket #22057: patch_commit_29974eaec3ec.patch

django/core/serializers/base.py

@@ -3 +3 @@
 """
 import warnings
 
-from django.db import models
 from django.utils import six
 
 
@@ -166 +165 @@
             self.object._meta.app_label, self.object._meta.object_name, self.object.pk)
 
     def save(self, save_m2m=True, using=None):
+        from django.db import models
         # Call save on the Model baseclass directly. This bypasses any
         # model-defined save. The save is also forced to be raw.
         # raw=True is passed to any pre/post_save signals.

django/core/serializers/python.py

@@ -8 +8 @@
 from django.apps import apps
 from django.conf import settings
 from django.core.serializers import base
-from django.db import models, DEFAULT_DB_ALIAS
 from django.utils.encoding import smart_text, is_protected_type
 from django.utils import six
 
@@ -85 +84 @@
     It's expected that you pass the Python objects themselves (instead of a
     stream or a string) to the constructor
     """
+    from django.db import models, DEFAULT_DB_ALIAS
     db = options.pop('using', DEFAULT_DB_ALIAS)
     ignore = options.pop('ignorenonexistent', False)