Adjusted the paginate function to only attempt a length check if per_page is valid...

[philo.git] / utils.py

diff --git a/utils.py b/utils.py
index 5fc3274..6fc2cff 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.contrib.contenttypes.models import ContentType

+from django.core.paginator import Paginator, EmptyPage

 
 
 class ContentTypeLimiter(object):
 
 
 class ContentTypeLimiter(object):


@@ -40,16 +41,19 @@ class ContentTypeSubclassLimiter(ContentTypeLimiter):
        
        def q_object(self):
                contenttype_pks = []
        
        def q_object(self):
                contenttype_pks = []

-               for subclass in self.cls.__subclasses__():
-                       try:
-                               if issubclass(subclass, models.Model):
-                                       if not subclass._meta.abstract:
-                                               if not self.inclusive and subclass is self.cls:
-                                                       continue
-                                               contenttype = ContentType.objects.get_for_model(subclass)
-                                               contenttype_pks.append(contenttype.pk)
-                       except:
-                               pass
+               def handle_subclasses(cls):
+                       for subclass in cls.__subclasses__():
+                               try:
+                                       if issubclass(subclass, models.Model):
+                                               if not subclass._meta.abstract:
+                                                       if not self.inclusive and subclass is self.cls:
+                                                               continue
+                                                       contenttype = ContentType.objects.get_for_model(subclass)
+                                                       contenttype_pks.append(contenttype.pk)
+                                       handle_subclasses(subclass)
+                               except:
+                                       pass
+               handle_subclasses(self.cls)

                return models.Q(pk__in=contenttype_pks)
 
 
                return models.Q(pk__in=contenttype_pks)
 
 


@@ -59,3 +63,43 @@ def fattr(*args, **kwargs):
                        setattr(function, key, kwargs[key])
                return function
        return wrapper
                        setattr(function, key, kwargs[key])
                return function
        return wrapper

+
+
+def paginate(objects, per_page=None, page_number=1):
+       """
+       Given a list of objects, return a (paginator, page, objects) tuple.
+       """
+       try:
+               per_page = int(per_page)
+       except (TypeError, ValueError):
+               # Then either it wasn't set or it was set to an invalid value
+               paginator = page = None
+       else:
+               # There also shouldn't be pagination if the list is too short. Try count()
+               # first - good chance it's a queryset, where count is more efficient.
+               try:
+                       if objects.count() <= per_page:
+                               paginator = page = None
+               except AttributeError:
+                       if len(objects) <= per_page:
+                               paginator = page = None
+       
+       try:
+               return paginator, page, objects
+       except NameError:
+               pass
+       
+       paginator = Paginator(objects, per_page)
+       try:
+               page_number = int(page_number)
+       except:
+               page_number = 1
+       
+       try:
+               page = paginator.page(page_number)
+       except EmptyPage:
+               page = None
+       else:
+               objects = page.object_list
+       
+       return paginator, page, objects