Changeset 8851 for django/trunk/django/db/models/manager.py

Timestamp:

09/02/08 04:04:54 (4 months ago)

Author:

mtredinnick

Message:

Fixed #7154 -- Inherit all model managers from abstract base classes.
Also added documentation describing how manager inheritance works (and when
manager aren't inherited). Based on some patches from sebastian_noack and
emulbreh.

Files:

• django/trunk/django/db/models/manager.py (modified) (3 diffs)

django/trunk/django/db/models/manager.py

@@ -24 +24 @@
-    def __init__(self):
-        super(Manager, self).__init__()
-
-
-
+
-        self.model = None
+        self._inherited = False
-
-    def contribute_to_class(self, model, name):
@@ -35 +34 @@
-        if not getattr(model, '_default_manager', None) or self.creation_counter < model._default_manager.creation_counter:
-            model._default_manager = self
+        if model._meta.abstract or self._inherited:
+            model._meta.abstract_managers.append((self.creation_counter, name,
+                    self))
+
+    def _set_creation_counter(self):
+        """
+        Sets the creation counter value for this instance and increments the
+        class-level copy.
+        """
+        self.creation_counter = Manager.creation_counter
+        Manager.creation_counter += 1
-
-    def _copy_to_model(self, model):
@@ -44 +54 @@
-        assert issubclass(model, self.model)
-        mgr = copy.copy(self)
+        mgr._set_creation_counter()
-        mgr.model = model
+        mgr._inherited = True
-        return mgr
-