Changeset 3279

Timestamp:

07/06/06 08:25:12 (2 years ago)

Author:

mtredinnick

Message:

Fixed another problem where we were creating a class twice via two import
paths. Self-referential relations (e.g. ForeignKey?('self')) were still slipping
through the net. Refs #1796.

Files:

• django/trunk/django/db/models/base.py (modified) (1 diff)

django/trunk/django/db/models/base.py

@@ -44 +44 @@
-            # For 'django.contrib.sites.models', this would be 'sites'.
-            new_class._meta.app_label = model_module.__name__.split('.')[-2]
+
+        # Bail out early if we have already created this class.
+        m = get_model(new_class._meta.app_label, name)
+        if m is not None:
+            return m
-
-        # Add all attributes to the class.