Ticket #12291: loading.py.diff

django/db/models/loading.py

@@ -30 +30 @@
 
         # -- Everything below here is only used when populating the cache --
         loaded = False,
-        handled = {},
+        handled = [],
         postponed = [],
         nesting_level = 0,
         write_lock = threading.RLock(),
@@ -67 +67 @@
         Loads the app with the provided fully qualified name, and returns the
         model module.
         """
-        self.handled[app_name] = None
+        if not app_name in self.handled:
+            self.handled.append(app_name)
         self.nesting_level += 1
         mod = __import__(app_name, {}, {}, ['models'])
         self.nesting_level -= 1
@@ -80 +81 @@
                 self.postponed.append(app_name)
             return None
         if mod.models not in self.app_store:
-            self.app_store[mod.models] = len(self.app_store)
+            self.app_store[mod.models] = self.handled.index(app_name)
         return mod.models
 
     def app_cache_ready(self):