RFD: Reuse existing paginator?

linaro_django_pagination/templatetags/pagination_tags.py

@@ -135,7 +135,8 @@ def __init__(self, queryset_var,  multiple_paginations, paginate_by=None,
         self.multiple_paginations = multiple_paginations
 
     def render(self, context):
-        if self.multiple_paginations or getattr(context, "paginator", None):
+        paginator = context.get('paginator', None)
+        if self.multiple_paginations or paginator:
             page_suffix = '_%s' % self.queryset_var
         else:
             page_suffix = ''
@@ -150,7 +151,10 @@ def render(self, context):
             orphans = self.orphans
         else:
             orphans = self.orphans.resolve(context)
-        paginator = Paginator(value, paginate_by, orphans)
+        # Use existing paginator if possible, to avoid bad
+        # values for eg. num_pages
+        if paginator is None:
+            paginator = Paginator(value, paginate_by, orphans)
         try:
             request = context['request']
         except KeyError: