Ticket #2232: recursive-import-fix.diff

django/db/models/base.py

@@ -9 +9 @@
 from django.db.models.options import Options, AdminOptions
 from django.db import connection, backend, transaction
 from django.db.models import signals
-from django.db.models.loading import register_models
+from django.db.models.loading import register_models, get_model
 from django.dispatch import dispatcher
 from django.utils.datastructures import SortedDict
 from django.utils.functional import curry
@@ -60 +60 @@
         new_class._prepare()
 
         register_models(new_class._meta.app_label, new_class)
-        return new_class
+        return get_model(new_class._meta.app_label, name)
 
 class Model(object):
     __metaclass__ = ModelBase

django/db/models/loading.py

@@ -73 +73 @@
     Returns the model matching the given app_label and case-insensitive model_name.
     Returns None if no model is found.
     """
-    get_apps() # Run get_apps() to populate the _app_list cache. Slightly hackish.
     try:
         model_dict = _app_models[app_label]
     except KeyError: