Changeset 3202

Timestamp:

06/25/06 09:49:34 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1796 -- only load a single copy of each model, even when it is
referenced via different import paths. Solves a problem with many-to-many
relations being set up incorrectly. Thanks to Curtis Thompson, Luke Plant and
Simon Willison for some excellent debugging of the problem. Refs #2232 (may
also have fixed that).

Files:

• django/trunk/django/db/models/loading.py (modified) (2 diffs)

django/trunk/django/db/models/loading.py

@@ -3 +3 @@
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
+import sys
+import os
-
-__all__ = ('get_apps', 'get_app', 'get_models', 'get_model', 'register_models')
@@ -92 +94 @@
-        model_name = model._meta.object_name.lower()
-        model_dict = _app_models.setdefault(app_label, {})
+        if model_dict.has_key(model_name):
+            # The same model may be imported via different paths (e.g.
+            # appname.models and project.appname.models). We use the source
+            # filename as a means to detect identity.
+            fname1 = os.path.normpath(sys.modules[model.__module__].__file__)
+            fname2 = os.path.normpath(sys.modules[model_dict[model_name].__module__].__file__)
+            # Since the filename extension could be .py the first time and .pyc
+            # or .pyo the second time, ignore the extension when comparing.
+            if os.path.splitext(fname1)[0] == os.path.splitext(fname2)[0]:
+                continue
-        model_dict[model_name] = model