From efad628a87e3bb3e4ec55f1ddcaab68853917e36 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Mon, 22 Apr 2013 15:32:11 +0000
Subject: [PATCH] Objects queryset manager now inherited (#256)

---
 docs/changelog.rst              |  1 +
 mongoengine/base/metaclasses.py | 10 ++++-----
 tests/queryset/queryset.py      | 36 +++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d7d010cb..01f5a549 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.8.X
 ================
+- Objects manager now inherited (#256)
 - Updated connection to use MongoClient (#262, #274)
 - Fixed db_alias and inherited Documents (#143)
 - Documentation update for document errors (#124)
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index a53744db..27040119 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -315,8 +315,8 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
         # may set allow_inheritance to False
         simple_class = all([b._meta.get('abstract')
                             for b in flattened_bases if hasattr(b, '_meta')])
-        if (not simple_class and meta['allow_inheritance'] == False and
-            not meta['abstract']):
+        if (not simple_class and meta['allow_inheritance'] is False and
+           not meta['abstract']):
             raise ValueError('Only direct subclasses of Document may set '
                              '"allow_inheritance" to False')
 
@@ -339,9 +339,9 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
         if callable(collection):
             new_class._meta['collection'] = collection(new_class)
 
-        # Provide a default queryset unless one has been set
-        manager = attrs.get('objects', QuerySetManager())
-        new_class.objects = manager
+        # Provide a default queryset unless exists or one has been set
+        if not hasattr(new_class, 'objects'):
+            new_class.objects = QuerySetManager()
 
         # Validate the fields and set primary key if needed
         for field_name, field in new_class._fields.iteritems():
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 42e98ae7..0d3ebf3d 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2233,6 +2233,42 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(0, Foo.with_inactive.count())
         self.assertEqual(1, Foo.objects.count())
 
+    def test_inherit_objects(self):
+
+        class Foo(Document):
+            meta = {'allow_inheritance': True}
+            active = BooleanField(default=True)
+
+            @queryset_manager
+            def objects(klass, queryset):
+                return queryset(active=True)
+
+        class Bar(Foo):
+            pass
+
+        Bar.drop_collection()
+        Bar.objects.create(active=False)
+        self.assertEqual(0, Bar.objects.count())
+
+    def test_inherit_objects_override(self):
+
+        class Foo(Document):
+            meta = {'allow_inheritance': True}
+            active = BooleanField(default=True)
+
+            @queryset_manager
+            def objects(klass, queryset):
+                return queryset(active=True)
+
+        class Bar(Foo):
+            @queryset_manager
+            def objects(klass, queryset):
+                return queryset(active=False)
+
+        Bar.drop_collection()
+        Bar.objects.create(active=False)
+        self.assertEqual(0, Foo.objects.count())
+        self.assertEqual(1, Bar.objects.count())
 
     def test_query_value_conversion(self):
         """Ensure that query values are properly converted when necessary.