Merge pull request brosner#3 from misli/get_queryset

renamed get_query_set to get_queryset

Author: Fantomas42

docs/overview.txt

@@ -202,7 +202,7 @@ A manager for retrieving tags used by a particular model.
 
 Defines the following methods:
 
-* ``get_query_set()`` -- as this method is redefined, any ``QuerySets``
+* ``get_queryset()`` -- as this method is redefined, any ``QuerySets``
   created by this model will be initially restricted to contain the
   distinct tags used by all the model's instances.
 

tagging/managers.py

@@ -2,6 +2,8 @@
 Custom managers for Django models registered with the tagging
 application.
 """
+
+import django
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
@@ -12,11 +14,15 @@ class ModelTagManager(models.Manager):
     """
     A manager for retrieving tags for a particular model.
     """
-    def get_query_set(self):
+    def get_queryset(self):
         ctype = ContentType.objects.get_for_model(self.model)
         return Tag.objects.filter(
             items__content_type__pk=ctype.pk).distinct()
 
+    # TODO: drop this
+    if django.VERSION < (1, 6):
+        get_query_set = get_queryset
+
     def cloud(self, *args, **kwargs):
         return Tag.objects.cloud_for_model(self.model, *args, **kwargs)