Fixed bug introduced with python2.3 compatability. Also, renamed the PyPI package...

git-svn-id: https://django-pagination.googlecode.com/svn/trunk@44 7f1efe38-554e-0410-b69d-834cb44da2d5

diff --git a/pagination/templatetags/pagination_tags.py b/pagination/templatetags/pagination_tags.py
index aa5297a..3442fcd 100644 (file)
--- a/pagination/templatetags/pagination_tags.py
+++ b/pagination/templatetags/pagination_tags.py
@@ -3,7 +3,6 @@ try:
 except NameError:
     from sets import Set as set
 from django import template
 except NameError:
     from sets import Set as set
 from django import template

-from django.db.models.query import QuerySet

 from django.core.paginator import Paginator, InvalidPage
 from django.conf import settings
 
 from django.core.paginator import Paginator, InvalidPage
 from django.conf import settings
 


@@ -145,7 +144,7 @@ def paginate(context, window=DEFAULT_WINDOW):
         if len(first.intersection(current)) == 0:
             first_list = list(first)
             first_list.sort()
         if len(first.intersection(current)) == 0:
             first_list = list(first)
             first_list.sort()

-            second_list = list(second)
+            second_list = list(current)

             second_list.sort()
             pages.extend(first_list)
             diff = second_list[0] - first_list[-1]
             second_list.sort()
             pages.extend(first_list)
             diff = second_list[0] - first_list[-1]

diff --git a/setup.py b/setup.py
index 9b09bbe..ea32ae2 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
 from setuptools import setup, find_packages
 

-version = '1.0.2'
+version = '1.0.4'

 
 LONG_DESCRIPTION = """
 How to use django-pagination
 
 LONG_DESCRIPTION = """
 How to use django-pagination


@@ -76,7 +76,7 @@ a way to navigate between the different pages--all without touching your views.
 """
 
 setup(
 """
 
 setup(

-    name='pagination',
+    name='django-pagination',

     version=version,
     description="django-pagination",
     long_description=LONG_DESCRIPTION,
     version=version,
     description="django-pagination",
     long_description=LONG_DESCRIPTION,


@@ -89,7 +89,7 @@ setup(
     keywords='pagination,django',
     author='Eric Florenzano',
     author_email='floguy@gmail.com',
     keywords='pagination,django',
     author='Eric Florenzano',
     author_email='floguy@gmail.com',

-    url='http://www.eflorenzano.com/',
+    url='http://django-pagination.googlecode.com/',

     license='BSD',
     packages=find_packages(),
     include_package_data=True,
     license='BSD',
     packages=find_packages(),
     include_package_data=True,