get_query_set -> get_queryset

Author: ask

djcelery/db.py

@@ -1,8 +1,18 @@
 from __future__ import absolute_import
 
+import django
+
 from contextlib import contextmanager
 from django.db import transaction
 
+if django.VERSION < (1, 6):  # pragma: no cover
+
+    def get_queryset(s):
+        return s.get_query_set()
+else:
+    def get_queryset(s):  # noqa
+        return s.get_queryset()
+
 try:
     from django.db.transaction import atomic  # noqa
 except ImportError:  # pragma: no cover

djcelery/managers.py

@@ -17,7 +17,7 @@
 
 from celery.utils.timeutils import maybe_timedelta
 
-from .db import commit_on_success, rollback_unless_managed
+from .db import commit_on_success, get_queryset, rollback_unless_managed
 from .utils import now
 
 
@@ -79,11 +79,12 @@ def update_or_create(self, **kwargs):
 
 class ExtendedManager(models.Manager):
 
-    def get_query_set(self):
+    def get_queryset(self):
         return ExtendedQuerySet(self.model)
+    get_query_set = get_queryset  # Pre django 1.6
 
     def update_or_create(self, **kwargs):
-        return self.get_query_set().update_or_create(**kwargs)
+        return get_queryset(self).update_or_create(**kwargs)
 
     def connection_for_write(self):
         if connections: