Merge pull request #29 from adepue/master

Use correct Manager structure

setup.py

@@ -73,7 +73,7 @@ def run_tests(self):
 
 setup(
     name='django-livefield',
-    version='2.3.0',
+    version='2.3.1',
     description='Convenient soft-deletion support for Django models',
     long_description=(
         open('README.rst').read() + '\n\n' +

src/livefield/gis/managers.py

@@ -1,21 +1,20 @@
 from django.db import models
-
 from .querysets import LiveGeoQuerySet
 
 
-LiveGeoManagerBase = models.Manager.from_queryset(LiveGeoQuerySet)
-
-
-class LiveGeoManager(LiveGeoManagerBase):
+class LiveGeoManagerBase(models.Manager):
     # To also use this manager for FK lookups, see
     # https://docs.djangoproject.com/en/1.6/topics/db/managers/#manager-types.
 
     def __init__(self, include_soft_deleted=False, *args, **kwargs):
         self.include_soft_deleted = include_soft_deleted
-        super(LiveGeoManager, self).__init__(*args, **kwargs)  # pylint: disable=super-on-old-class
+        super(LiveGeoManagerBase, self).__init__(*args, **kwargs)  # pylint: disable=super-on-old-class
 
     def get_queryset(self):
-        qs = super(LiveGeoManager, self).get_queryset()  # pylint: disable=super-on-old-class
+        qs = super(LiveGeoManagerBase, self).get_queryset()  # pylint: disable=super-on-old-class
         if not self.include_soft_deleted:
             return qs.live()
         return qs
+
+
+LiveGeoManager = LiveGeoManagerBase.from_queryset(LiveGeoQuerySet)

src/livefield/managers.py

@@ -3,19 +3,19 @@
 from .querysets import LiveQuerySet
 
 
-LiveManagerBase = models.Manager.from_queryset(LiveQuerySet)
-
-
-class LiveManager(LiveManagerBase):
+class LiveManagerBase(models.Manager):
     # To also use this manager for FK lookups, see
     # https://docs.djangoproject.com/en/1.6/topics/db/managers/#manager-types.
 
     def __init__(self, include_soft_deleted=False, *args, **kwargs):
         self.include_soft_deleted = include_soft_deleted
-        super(LiveManager, self).__init__(*args, **kwargs)  # pylint: disable=super-on-old-class
+        super(LiveManagerBase, self).__init__(*args, **kwargs)  # pylint: disable=super-on-old-class
 
     def get_queryset(self):
-        qs = super(LiveManager, self).get_queryset()  # pylint: disable=super-on-old-class
+        qs = super(LiveManagerBase, self).get_queryset()  # pylint: disable=super-on-old-class
         if not self.include_soft_deleted:
             return qs.live()
         return qs
+
+
+LiveManager = LiveManagerBase.from_queryset(LiveQuerySet)