Merge pull request #80 from ebrelsford/master

Use get_queryset() instead of get_query_set()

caching/base.py

@@ -1,6 +1,7 @@
 import functools
 import logging
 
+import django
 from django.conf import settings
 from django.db import models
 from django.db.models import signals
@@ -32,9 +33,12 @@ class CachingManager(models.Manager):
     # Tell Django to use this manager when resolving foreign keys.
     use_for_related_fields = True
 
-    def get_query_set(self):
+    def get_queryset(self):
         return CachingQuerySet(self.model, using=self._db)
 
+    if django.VERSION < (1, 6):
+        get_query_set = get_queryset
+
     def contribute_to_class(self, cls, name):
         signals.post_save.connect(self.post_save, sender=cls)
         signals.post_delete.connect(self.post_delete, sender=cls)
@@ -56,7 +60,7 @@ def raw(self, raw_query, params=None, *args, **kwargs):
                                   using=self._db, *args, **kwargs)
 
     def cache(self, timeout=DEFAULT_TIMEOUT):
-        return self.get_query_set().cache(timeout)
+        return self.get_queryset().cache(timeout)
 
     def no_cache(self):
         return self.cache(NO_CACHE)

docs/index.rst

@@ -95,7 +95,7 @@ that class and inherit from the :class:`~caching.base.CachingMixin`.  If you
 want related lookups (foreign keys) to hit the cache, ``CachingManager`` must
 be the default manager.  If you have multiple managers that should be cached,
 return a :class:`~caching.base.CachingQuerySet` from the other manager's
-``get_query_set`` method instead of subclassing ``CachingManager``, since that
+``get_queryset`` method instead of subclassing ``CachingManager``, since that
 would hook up the post_save and post_delete signals multiple times.
 
 Here's what a minimal cached model looks like::