From a1dc5ac9f730e7fca7b42ab42c6446d199363eda Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 10:45:44 +0300
Subject: [PATCH 1/9] Use travis-ci

Resolve issue #16
---
 .travis.yml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..4d555f6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,67 @@
+language: python
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+env:
+  matrix:
+    - DJANGO_VERSION=1.2
+    - DJANGO_VERSION=1.3
+    - DJANGO_VERSION=1.4
+    - DJANGO_VERSION=1.5
+    - DJANGO_VERSION=1.6
+    - DJANGO_VERSION=1.7
+    - DJANGO_VERSION=1.8
+    - DJANGO_VERSION=1.9
+install:
+  - pip install 'coverage<4' # coverage>=4 has issues with python3
+  - pip install -q Django==$DJANGO_VERSION coveralls
+  - python setup.py egg_info
+script: coverage run --source='linaro_django_pagination' --omit *runner*,*test_project* setup.py test
+after_success:
+  - coveralls
+matrix:
+  include:
+    - python: "2.6"
+      env: DJANGO_VERSION=1.4
+    - python: "2.6"
+      env: DJANGO_VERSION=1.5
+    - python: "2.6"
+      env: DJANGO_VERSION=1.6
+  exclude:
+    - python: "3.2"
+      env: DJANGO_VERSION=1.2 # Unsupported
+    - python: "3.2"
+      env: DJANGO_VERSION=1.3 # Unsupported
+    - python: "3.2"
+      env: DJANGO_VERSION=1.4 # Unsupported
+    - python: "3.2"
+      env: DJANGO_VERSION=1.9 # Unsupported
+    - python: "3.3"
+      env: DJANGO_VERSION=1.9 # ImportError: cannot import name find_spec
+    - python: "3.3"
+      env: DJANGO_VERSION=1.2 # Unsupported
+    - python: "3.3"
+      env: DJANGO_VERSION=1.3 # Unsupported
+    - python: "3.3"
+      env: DJANGO_VERSION=1.4 # Unsupported
+    - python: "3.4"
+      env: DJANGO_VERSION=1.2 # Unsupported
+    - python: "3.4"
+      env: DJANGO_VERSION=1.3 # Unsupported
+    - python: "3.4"
+      env: DJANGO_VERSION=1.4 # Unsupported
+    - python: "3.5"
+      env: DJANGO_VERSION=1.2 # Unsupported
+    - python: "3.5"
+      env: DJANGO_VERSION=1.3 # Unsupported
+    - python: "3.5"
+      env: DJANGO_VERSION=1.4 # Unsupported
+    - python: "3.5"
+      env: DJANGO_VERSION=1.5 # Unsupported
+    - python: "3.5"
+      env: DJANGO_VERSION=1.7 # AttributeError: module 'html.parser' has no attribute 'HTMLParseError'
+    - python: "3.5"
+      env: DJANGO_VERSION=1.6 # AttributeError: module 'html.parser' has no attribute 'HTMLParseError'

From 3cc56edb7888c2430e41ef0f2f4e38e4357e74ab Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 10:52:28 +0300
Subject: [PATCH 2/9] Add *.rst extension to README file

---
 README => README.rst | 0
 setup.py             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename README => README.rst (100%)

diff --git a/README b/README.rst
similarity index 100%
rename from README
rename to README.rst
diff --git a/setup.py b/setup.py
index 2686bd8..0fb6f20 100755
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
     author='Zygmunt Krynicki',
     author_email='zygmunt.krynicki@linaro.org',
     description="linaro-django-pagination",
-    long_description=open("README").read(),
+    long_description=open("README.rst").read(),
     keywords='pagination,django',
     url='https://github.com/zyga/django-pagination',
     test_suite='linaro_django_pagination.test_project.tests.run_tests',

From 59500533db29f189154369ce87f0027f2d0cd84c Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 11:44:49 +0300
Subject: [PATCH 3/9] Add travis and coveralls badges to README file

---
 README.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.rst b/README.rst
index ff4d063..190dc82 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,14 @@
+========================
+Linaro Django Pagination
+========================
+
+.. image:: https://travis-ci.org/zyga/django-pagination.svg?branch=master
+    :target: https://travis-ci.org/zyga/django-pagination
+
+.. image:: https://coveralls.io/repos/zyga/django-pagination/badge.svg?branch=master&service=github
+    :target: https://coveralls.io/github/zyga/django-pagination?branch=master
+
+
 About the fork
 --------------
 

From 994531a1c248812008f698a7c2f6cfb7eddf2170 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 11:39:44 +0300
Subject: [PATCH 4/9] Add new test runner

Also move test.py file to tests directory
---
 linaro_django_pagination/tests/__init__.py    |  0
 linaro_django_pagination/tests/runner.py      | 36 +++++++++++++++++++
 .../{tests.py => tests/test_main.py}          | 14 ++++----
 setup.py                                      | 10 ++----
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 linaro_django_pagination/tests/__init__.py
 create mode 100755 linaro_django_pagination/tests/runner.py
 rename linaro_django_pagination/{tests.py => tests/test_main.py} (96%)

diff --git a/linaro_django_pagination/tests/__init__.py b/linaro_django_pagination/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/linaro_django_pagination/tests/runner.py b/linaro_django_pagination/tests/runner.py
new file mode 100755
index 0000000..44c6f69
--- /dev/null
+++ b/linaro_django_pagination/tests/runner.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+import django
+import doctest
+import sys
+
+from django.conf import settings
+
+
+def runtests():
+    if not settings.configured:
+        # Configure test environment
+        settings.configure(
+            SECRET_KEY='fake-key',
+            INSTALLED_APPS=(
+                'linaro_django_pagination',
+            ),
+        )
+
+    try:
+        django.setup()
+    except AttributeError:  # for Django 1.6 compatible
+        pass
+
+    from django.test.utils import get_runner
+
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests(
+        ["linaro_django_pagination.tests"],
+        extra_tests=[doctest.DocTestSuite('linaro_django_pagination.tests.test_main')]
+    )
+    sys.exit(bool(failures))
+
+
+if __name__ == '__main__':
+    runtests()
diff --git a/linaro_django_pagination/tests.py b/linaro_django_pagination/tests/test_main.py
similarity index 96%
rename from linaro_django_pagination/tests.py
rename to linaro_django_pagination/tests/test_main.py
index 90468d5..ba1baa1 100644
--- a/linaro_django_pagination/tests.py
+++ b/linaro_django_pagination/tests/test_main.py
@@ -170,30 +170,30 @@
 >>> class HttpRequest(DjangoHttpRequest):
 ...     page = lambda self, suffix: 1
 
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...<a href="?page=2"...
 >>> t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
 >>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
 u'[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]'
 >>>
 >>> t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}{% autopaginate var by as foo %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()}))
+>>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
 u'\\n...\\n...<div class="pagination">...<a href="?page_var2=2"...<a href="?page_var=2"...
 >>>
 
 # Testing InfinitePaginator
 
->>> from paginator import InfinitePaginator
+>>> from linaro_django_pagination.paginator import InfinitePaginator
 
 >>> InfinitePaginator
 <class 'linaro_django_pagination.paginator.InfinitePaginator'>
@@ -222,7 +222,7 @@
 
 # Testing FinitePaginator
 
->>> from paginator import FinitePaginator
+>>> from linaro_django_pagination.paginator import FinitePaginator
 
 >>> FinitePaginator
 <class 'linaro_django_pagination.paginator.FinitePaginator'>
diff --git a/setup.py b/setup.py
index 0fb6f20..0a9781e 100755
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,10 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
 from setuptools import setup, find_packages
 
+os.environ['DJANGO_SETTINGS_MODULE'] = 'linaro_django_pagination.tests.settings'
 
 setup(
     name='linaro-django-pagination',
@@ -42,7 +44,7 @@
     long_description=open("README.rst").read(),
     keywords='pagination,django',
     url='https://github.com/zyga/django-pagination',
-    test_suite='linaro_django_pagination.test_project.tests.run_tests',
+    test_suite="linaro_django_pagination.tests.runner.runtests",
     license='BSD',
     packages=find_packages(),
     classifiers=[
@@ -57,12 +59,6 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
     ],
-    install_requires=[
-        'django >= 1.2',
-    ],
-    tests_require=[
-        'django-testproject >= 0.1',
-    ],
     setup_requires=[
         'versiontools >= 1.3.1'
     ],

From fb9e18b59453b249bae9b31531ff9bd39f23adfb Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 12:09:59 +0300
Subject: [PATCH 5/9] Convert doctests to django unittests

Resolve issue #30
---
 linaro_django_pagination/tests/__init__.py  |   1 +
 linaro_django_pagination/tests/runner.py    |  24 +-
 linaro_django_pagination/tests/settings.py  |  12 +
 linaro_django_pagination/tests/test_main.py | 575 ++++++++++++--------
 4 files changed, 354 insertions(+), 258 deletions(-)
 create mode 100644 linaro_django_pagination/tests/settings.py

diff --git a/linaro_django_pagination/tests/__init__.py b/linaro_django_pagination/tests/__init__.py
index e69de29..7ac2628 100644
--- a/linaro_django_pagination/tests/__init__.py
+++ b/linaro_django_pagination/tests/__init__.py
@@ -0,0 +1 @@
+from .test_main import *
diff --git a/linaro_django_pagination/tests/runner.py b/linaro_django_pagination/tests/runner.py
index 44c6f69..8ef3ab9 100755
--- a/linaro_django_pagination/tests/runner.py
+++ b/linaro_django_pagination/tests/runner.py
@@ -1,36 +1,22 @@
 #!/usr/bin/env python
+
 import django
-import doctest
+import os
 import sys
 
-from django.conf import settings
+from django.core.management import call_command
 
 
 def runtests():
-    if not settings.configured:
-        # Configure test environment
-        settings.configure(
-            SECRET_KEY='fake-key',
-            INSTALLED_APPS=(
-                'linaro_django_pagination',
-            ),
-        )
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'linaro_django_pagination.tests.settings'
 
     try:
         django.setup()
     except AttributeError:  # for Django 1.6 compatible
         pass
 
-    from django.test.utils import get_runner
-
-    TestRunner = get_runner(settings)
-    test_runner = TestRunner()
-    failures = test_runner.run_tests(
-        ["linaro_django_pagination.tests"],
-        extra_tests=[doctest.DocTestSuite('linaro_django_pagination.tests.test_main')]
-    )
+    failures = call_command('test', 'linaro_django_pagination')
     sys.exit(bool(failures))
 
-
 if __name__ == '__main__':
     runtests()
diff --git a/linaro_django_pagination/tests/settings.py b/linaro_django_pagination/tests/settings.py
new file mode 100644
index 0000000..1572dfc
--- /dev/null
+++ b/linaro_django_pagination/tests/settings.py
@@ -0,0 +1,12 @@
+DATABASES = {
+    'default': {
+        'NAME': ':memory:',
+        'ENGINE': 'django.db.backends.sqlite3',
+    }
+}
+
+SECRET_KEY = 'fake-key'
+
+INSTALLED_APPS = (
+    'linaro_django_pagination',
+)
diff --git a/linaro_django_pagination/tests/test_main.py b/linaro_django_pagination/tests/test_main.py
index ba1baa1..1dc6d2c 100644
--- a/linaro_django_pagination/tests/test_main.py
+++ b/linaro_django_pagination/tests/test_main.py
@@ -28,243 +28,340 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from django.core.paginator import Paginator
+from django.http import HttpRequest as DjangoHttpRequest
+from django.template import Template, Context
+
+try:
+    from django.test import SimpleTestCase
+except ImportError:  # Django 1.2 compatible
+    from django.test import TestCase as SimpleTestCase
+
+from linaro_django_pagination.paginator import InfinitePaginator, FinitePaginator
+from linaro_django_pagination.templatetags.pagination_tags import paginate
+from linaro_django_pagination.middleware import PaginationMiddleware
+
+
+class HttpRequest(DjangoHttpRequest):
+     page = lambda self, suffix: 1
+
+
+class CommonTestCase(SimpleTestCase):
+    def test_records_for_the_first_page(self):
+        p = Paginator(range(15), 2)
+        pg = paginate({'paginator': p, 'page_obj': p.page(1)})
+        self.assertListEqual(pg['pages'], [1, 2, 3, 4, 5, 6, 7, 8])
+        self.assertEqual(pg['records']['first'], 1)
+        self.assertEqual(pg['records']['last'], 2)
+
+    def test_records_for_the_last_page(self):
+        p = Paginator(range(15), 2)
+        pg = paginate({'paginator': p, 'page_obj': p.page(8)})
+        self.assertListEqual(pg['pages'], [1, 2, 3, 4, 5, 6, 7, 8])
+        self.assertEqual(pg['records']['first'], 15)
+        self.assertEqual(pg['records']['last'], 15)
+
+    def test_pages_list(self):
+        p = Paginator(range(17), 2)
+        self.assertEqual(paginate({'paginator': p, 'page_obj': p.page(1)})['pages'], [1, 2, 3, 4, 5, 6, 7, 8, 9])
+
+    def test_page_with_empty_objects_list(self):
+        p = Paginator(range(0), 2)
+        self.assertListEqual(paginate({'paginator': p, 'page_obj': p.page(1)})['pages'], [1])
+
+
+class DefaultWindowTestCase(SimpleTestCase):
+    """
+    Test paginate using default window setting
+    moving the window from 1 ... to end
+    window size = 2, margin = 2
+    window = 2 -> show 5 pages
+    """
+    def setUp(self):
+        self.p = Paginator(range(31), 2)
+
+    def test_on_start_page_1(self):
+        # [1] 2 3 4 5 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(1)}, 2, 2)['pages'],
+            [1, 2, 3, 4, 5, None, 15, 16]
+        )
+
+    def test_on_start_page_2(self):
+        # 1 [2] 3 4 5 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(2)}, 2, 2)['pages'],
+            [1, 2, 3, 4, 5, None, 15, 16]
+        )
+
+    def test_on_start_page_3(self):
+        # 1 2 [3] 4 5 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(3)}, 2, 2)['pages'],
+            [1, 2, 3, 4, 5, None, 15, 16]
+        )
+
+    def test_on_start_page_4(self):
+        # 1 2 3 [4] 5 6 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(4)}, 2, 2)['pages'],
+            [1, 2, 3, 4, 5, 6, None, 15, 16])
+
+    def test_on_start_page_5(self):
+        # 1 2 3 4 [5] 6 7 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(5)}, 2, 2)['pages'],
+            [1, 2, 3, 4, 5, 6, 7, None, 15, 16]
+        )
+
+    def test_in_middle(self):
+        # 1 2 ... 5 6 [7] 8 9 ... 15, 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(7)}, 2, 2)['pages'],
+            [1, 2, None, 5, 6, 7, 8, 9, None, 15, 16]
+        )
+
+    def test_on_end_page_13(self):
+        # 1 2 ... 12 [13] 14 15 16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(13)}, 2, 2)['pages'],
+            [1, 2, None, 11, 12, 13, 14, 15, 16],
+        )
+
+    def test_on_end(self):
+        # 1 2 ... 12 13 14 15 [16
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(16)}, 2, 2)['pages'],
+            [1, 2, None, 12, 13, 14, 15, 16]
+        )
+
+
+class NoMarginTestCase(SimpleTestCase):
+    def setUp(self):
+        self.p = Paginator(range(31), 2)
+
+    def test_on_start(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(3)}, 2, 0)['pages'],
+            [1, 2, 3, 4, 5, None],
+        )
+
+    def test_in_middle(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(5)}, 2, 0)['pages'],
+            [None, 3, 4, 5, 6, 7, None],
+        )
+
+    def test_on_end(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(16)}, 2, 0)['pages'],
+            [None, 12, 13, 14, 15, 16],
+        )
+
+
+class ZeroWindowZeroMarginTestCase(SimpleTestCase):
+    """
+    Test paginate using window=0 and margin=0
+    """
+    def setUp(self):
+        self.p = Paginator(range(31), 2)
+
+    def test_on_start_page_1(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(1)}, 0, 0)['pages'],
+            [1, None],
+        )
+
+    def test_in_middle_page_2(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(2)}, 0, 0)['pages'],
+            [None, 2, None],
+        )
+
+    def test_in_middle_page_3(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(3)}, 0, 0)['pages'],
+            [None, 3, None],
+        )
+
+    def test_in_middle_page_10(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(10)}, 0, 0)['pages'],
+            [None, 10, None],
+        )
+
+    def test_in_middle_page_14(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(14)}, 0, 0)['pages'],
+            [None, 14, None],
+        )
+
+    def test_in_middle_page_15(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(15)}, 0, 0)['pages'],
+            [None, 15, None],
+        )
+
+    def test_on_end_page_16(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(16)}, 0, 0)['pages'],
+            [None, 16],
+        )
+
+
+class SpecialTestCase(SimpleTestCase):
+    def test_middle_with_no_window_and_margin_1(self):
+        p = Paginator(range(31), 2)
+        self.assertListEqual(
+            paginate({'paginator': p, 'page_obj': p.page(5)}, 0, 1)['pages'],
+            [1, None, 5, None, 16],
+        )
+
+    def test_middle_with_no_window_and_margin_4(self):
+        p = Paginator(range(21), 2, 1)
+        self.assertListEqual(
+            paginate({'paginator': p, 'page_obj': p.page(1)}, 0, 4)['pages'],
+            [1, 2, 3, 4, None, 7, 8, 9, 10],
+        )
+
+
+class TemplateRenderingTestCase(SimpleTestCase):
+    def test_default_tag_options(self):
+        t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
+        self.assertIn(
+            '<div class="pagination">',
+            t.render(Context({'var': range(21), 'request': HttpRequest()})),
+        )
+
+    def test_paginate_by_option(self):
+        t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
+        self.assertIn(
+            '<div class="pagination">',
+            t.render(Context({'var': range(21), 'request': HttpRequest()})),
+        )
+
+    def test_orphans_option(self):
+        t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
+        content = t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
+        self.assertIn('<div class="pagination">', content)
+        self.assertIn('<a href="?page=2"', content)
+
+    def test_as_option(self):
+        t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
+        self.assertEqual(
+            t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()})),
+            str(range(20)),
+        )
+
+    def test_multiple_pagination(self):
+        t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}"
+                     "{% autopaginate var by as foo %}{% paginate %}")
+        content = t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()}))
+        self.assertIn('<div class="pagination">', content)
+        self.assertIn('<a href="?page_var2=2"', content)
+        self.assertIn('<a href="?page_var=2"', content)
+
+
+class InfinitePaginatorTestCase(SimpleTestCase):
+    def setUp(self):
+        self.p = InfinitePaginator(range(20), 2, link_template='/bacon/page/%d')
+
+    def test_paginator_repr(self):
+        self.assertEqual(
+            repr(InfinitePaginator),
+            "<class 'linaro_django_pagination.paginator.InfinitePaginator'>",
+        )
+
+    def test_validate_number(self):
+        self.assertEqual(self.p.validate_number(2), 2)
+
+    def test_orphans(self):
+        self.assertEqual(self.p.orphans, 0)
+
+    def test_page_repr(self):
+        self.assertEqual(repr(self.p.page(3)), '<Page 3>')
+
+    def test_page_end_index(self):
+        self.assertEqual(self.p.page(3).end_index(), 6)
 
-"""
->>> from django.core.paginator import Paginator
->>> from linaro_django_pagination.templatetags.pagination_tags import paginate
->>> from django.template import Template, Context
-
->>> p = Paginator(range(15), 2)
->>> pg = paginate({'paginator': p, 'page_obj': p.page(1)})
->>> pg['pages']
-[1, 2, 3, 4, 5, 6, 7, 8]
->>> pg['records']['first']
-1
->>> pg['records']['last']
-2
-
->>> p = Paginator(range(15), 2)
->>> pg = paginate({'paginator': p, 'page_obj': p.page(8)})
->>> pg['pages']
-[1, 2, 3, 4, 5, 6, 7, 8]
->>> pg['records']['first']
-15
->>> pg['records']['last']
-15
-
->>> p = Paginator(range(17), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages']
-[1, 2, 3, 4, 5, 6, 7, 8, 9]
-
-
-# on start
-# moving the window from 1 ... to end
-# window size = 2, margin = 2
-# [1] 2 3 4 5 ... 15, 16
-# 1 [2] 3 4 5 ... 15, 16
-# 1 2 [3] 4 5 ... 15, 16
-# 1 2 3 [4] 5 6 ... 15, 16
-# 1 2 3 4 [5] 6 7 ... 15, 16
-# 1 2 3 4 5 [6] 7 8 ... 15, 16
-# 1 2 ... 5 6 [7] 8 9 ... 15, 16
-
-# window = 2 -> show 5 pages
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(1)}, 2, 2)['pages']
-[1, 2, 3, 4, 5, None, 15, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(2)}, 2, 2)['pages']
-[1, 2, 3, 4, 5, None, 15, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(3)}, 2, 2)['pages']
-[1, 2, 3, 4, 5, None, 15, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(4)}, 2, 2)['pages']
-[1, 2, 3, 4, 5, 6, None, 15, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(5)}, 2, 2)['pages']
-[1, 2, 3, 4, 5, 6, 7, None, 15, 16]
-
-# in the middle
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(7)}, 2, 2)['pages']
-[1, 2, None, 5, 6, 7, 8, 9, None, 15, 16]
-
-# on end
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(16)}, 2, 2)['pages']
-[1, 2, None, 12, 13, 14, 15, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(13)}, 2, 2)['pages']
-[1, 2, None, 11, 12, 13, 14, 15, 16]
-
-
->>> p = Paginator(range(0), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(1)})['pages']
-[1]
-
-
-
-# no margin
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(3)}, 2, 0)['pages']
-[1, 2, 3, 4, 5, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(5)}, 2, 0)['pages']
-[None, 3, 4, 5, 6, 7, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(16)}, 2, 0)['pages']
-[None, 12, 13, 14, 15, 16]
-
-
-# special
-# zero window, zero margin
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(1)}, 0, 0)['pages']
-[1, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(2)}, 0, 0)['pages']
-[None, 2, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(3)}, 0, 0)['pages']
-[None, 3, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(10)}, 0, 0)['pages']
-[None, 10, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(14)}, 0, 0)['pages']
-[None, 14, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(15)}, 0, 0)['pages']
-[None, 15, None]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(16)}, 0, 0)['pages']
-[None, 16]
-
->>> p = Paginator(range(31), 2)
->>> paginate({'paginator': p, 'page_obj': p.page(5)}, 0, 1)['pages']
-[1, None, 5, None, 16]
-
->>> p = Paginator(range(21), 2, 1)
->>> paginate({'paginator': p, 'page_obj': p.page(1)}, 0, 4)['pages']
-[1, 2, 3, 4, None, 7, 8, 9, 10]
-
-# Testing template rendering
-
->>> t = Template("{% load pagination_tags %}{% autopaginate var 2 %}{% paginate %}")
-
->>> from django.http import HttpRequest as DjangoHttpRequest
->>> class HttpRequest(DjangoHttpRequest):
-...     page = lambda self, suffix: 1
-
->>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
-u'\\n...\\n...<div class="pagination">...
->>>
->>> t = Template("{% load pagination_tags %}{% autopaginate var %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
-u'\\n...\\n...<div class="pagination">...
->>> t = Template("{% load pagination_tags %}{% autopaginate var 20 %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'request': HttpRequest()})) #doctest: +ELLIPSIS
-u'\\n...\\n...<div class="pagination">...
->>> t = Template("{% load pagination_tags %}{% autopaginate var by %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
-u'\\n...\\n...<div class="pagination">...<a href="?page=2"...
->>> t = Template("{% load pagination_tags %}{% autopaginate var by as foo %}{{ foo }}")
->>> t.render(Context({'var': range(21), 'by': 20, 'request': HttpRequest()}))
-u'[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]'
->>>
->>> t = Template("{% load pagination_tags %}{% autopaginate var2 by as foo2 %}{% paginate %}{% autopaginate var by as foo %}{% paginate %}")
->>> t.render(Context({'var': range(21), 'var2': range(50, 121), 'by': 20, 'request': HttpRequest()})) #doctest: +ELLIPSIS
-u'\\n...\\n...<div class="pagination">...<a href="?page_var2=2"...<a href="?page_var=2"...
->>>
-
-# Testing InfinitePaginator
-
->>> from linaro_django_pagination.paginator import InfinitePaginator
-
->>> InfinitePaginator
-<class 'linaro_django_pagination.paginator.InfinitePaginator'>
->>> p = InfinitePaginator(range(20), 2, link_template='/bacon/page/%d')
->>> p.validate_number(2)
-2
->>> p.orphans
-0
->>> p3 = p.page(3)
->>> p3
-<Page 3>
->>> p3.end_index()
-6
->>> p3.has_next()
-True
->>> p3.has_previous()
-True
->>> p.page(10).has_next()
-False
->>> p.page(1).has_previous()
-False
->>> p3.next_link()
-'/bacon/page/4'
->>> p3.previous_link()
-'/bacon/page/2'
-
-# Testing FinitePaginator
-
->>> from linaro_django_pagination.paginator import FinitePaginator
-
->>> FinitePaginator
-<class 'linaro_django_pagination.paginator.FinitePaginator'>
->>> p = FinitePaginator(range(20), 2, offset=10, link_template='/bacon/page/%d')
->>> p.validate_number(2)
-2
->>> p.orphans
-0
->>> p3 = p.page(3)
->>> p3
-<Page 3>
->>> p3.start_index()
-10
->>> p3.end_index()
-6
->>> p3.has_next()
-True
->>> p3.has_previous()
-True
->>> p3.next_link()
-'/bacon/page/4'
->>> p3.previous_link()
-'/bacon/page/2'
-
->>> p = FinitePaginator(range(20), 20, offset=10, link_template='/bacon/page/%d')
->>> p2 = p.page(2)
->>> p2
-<Page 2>
->>> p2.has_next()
-False
->>> p3.has_previous()
-True
->>> p2.next_link()
-
->>> p2.previous_link()
-'/bacon/page/1'
-
->>> from linaro_django_pagination.middleware import PaginationMiddleware
->>> from django.core.handlers.wsgi import WSGIRequest
->>> from StringIO import StringIO
->>> middleware = PaginationMiddleware()
->>> request = WSGIRequest({'REQUEST_METHOD': 'POST', 'CONTENT_TYPE': 'multipart', 'wsgi.input': StringIO()})
->>> middleware.process_request(request)
->>> request.upload_handlers.append('asdf')
-"""
+    def test_page_has_next(self):
+        self.assertTrue(self.p.page(3).has_next(), True)
+
+    def test_page_has_previous(self):
+        self.assertTrue(self.p.page(3).has_previous(), True)
+
+    def test_page_next_link(self):
+        self.assertEqual(self.p.page(3).next_link(), '/bacon/page/4')
+
+    def test_page_previous_link(self):
+        self.assertEqual(self.p.page(3).previous_link(), '/bacon/page/2')
+
+    def test_last_page_which_has_no_next_page(self):
+        self.assertFalse(self.p.page(10).has_next())
+
+    def test_first_page_which_has_no_previous_page(self):
+        self.assertFalse(self.p.page(1).has_previous())
+
+
+class FinitePaginatorTestCase(SimpleTestCase):
+    def setUp(self):
+        self.p = FinitePaginator(range(20), 2, offset=10, link_template='/bacon/page/%d')
+
+    def test_repr(self):
+        self.assertEqual(
+            repr(FinitePaginator),
+            "<class 'linaro_django_pagination.paginator.FinitePaginator'>"
+        )
+
+    def test_validate_number(self):
+        self.assertEqual(self.p.validate_number(2), 2)
+
+    def test_orphans(self):
+        self.assertEqual(self.p.orphans, 0)
+
+    def test_page_repr(self):
+        self.assertEqual(repr(self.p.page(3)), '<Page 3>')
+
+    def test_page_start_index(self):
+        self.assertEqual(self.p.page(3).start_index(), 10)
+
+    def test_page_end(self):
+        self.assertEqual(self.p.page(3).end_index(), 6)
+
+    def test_page_has_next(self):
+        self.assertTrue(self.p.page(3).has_next(), True)
+
+    def test_page_has_previous(self):
+        self.assertTrue(self.p.page(3).has_previous(), True)
+
+    def test_page_next_link(self):
+        self.assertEqual(self.p.page(3).next_link(), '/bacon/page/4')
+
+    def test_page_previous_link(self):
+        self.assertEqual(self.p.page(3).previous_link(), '/bacon/page/2')
+
+    def test_on_start_page_repr(self):
+        self.assertEqual(repr(self.p.page(2)), '<Page 2>')
+
+    def test_on_start_has_no_next(self):
+        self.assertTrue(self.p.page(2).has_next(), False)
+
+    def test_on_start_has_previous(self):
+        self.assertTrue(self.p.page(2).has_previous(), True)
+
+    def test_on_start_has_next_link(self):
+        self.assertEqual(self.p.page(2).next_link(), '/bacon/page/3')
+
+    def test_on_start_has_previous_link(self):
+        self.assertEqual(self.p.page(2).previous_link(), '/bacon/page/1')
+
+
+class MiddlewareTestCase(SimpleTestCase):
+    """
+    Test middleware
+    """
+    def test_get_page_in_request(self):
+        middleware = PaginationMiddleware()
+        request = DjangoHttpRequest()
+        middleware.process_request(request)
+        self.assertEqual(request.page(''), 1)

From b401bf0ef7b6945ffb07f905dd59e1868a48671c Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 10:43:58 +0300
Subject: [PATCH 6/9] Fix bug with multiple paginations

Since `parser.tokens` doesn't returns a whole tokens of a template, in this
case the last remaining autopaginate tag makes `multiple_paginations` false,
so page-suffix of the last paginate tag will be empty.
---
 linaro_django_pagination/templatetags/pagination_tags.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index da22e95..d07bc61 100644
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -140,7 +140,11 @@ 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):
+        # Save multiple_paginations state in context
+        if self.multiple_paginations and 'multiple_paginations' not in context:
+            context['multiple_paginations'] = True
+
+        if context.get('multiple_paginations') or getattr(context, "paginator", None):
             page_suffix = '_%s' % self.queryset_var
         else:
             page_suffix = ''

From b180263fd69054c1f16a3c97b283026137c78d7c Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 18:17:24 +0300
Subject: [PATCH 7/9] Force convert range to list for python3 compatible

Resolve PR #32
---
 linaro_django_pagination/templatetags/pagination_tags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index d07bc61..d6e121e 100644
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -268,7 +268,7 @@ def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
         paginator = context['paginator']
         page_obj = context['page_obj']
         page_suffix = context.get('page_suffix', '')
-        page_range = paginator.page_range
+        page_range = list(paginator.page_range)
         # Calculate the record range in the current page for display.
         records = {'first': 1 + (page_obj.number - 1) * paginator.per_page}
         records['last'] = records['first'] + paginator.per_page - 1

From cfb14ce2fe55045b2c6bd2440ae04f92cc7db131 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Fri, 1 Jan 2016 18:37:59 +0300
Subject: [PATCH 8/9] Remove unicode strings for python3 compatible

---
 linaro_django_pagination/templatetags/pagination_tags.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index d6e121e..167f13a 100644
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -174,7 +174,7 @@ def render(self, context):
                     'False, an HTTP 404 page would have been shown instead.')
             context[key] = []
             context['invalid_page'] = True
-            return u''
+            return ''
         if self.context_var is not None:
             context[self.context_var] = page_obj.object_list
         else:
@@ -182,7 +182,7 @@ def render(self, context):
         context['paginator'] = paginator
         context['page_obj'] = page_obj
         context['page_suffix'] = page_suffix
-        return u''
+        return ''
 
 
 class PaginateNode(Node):

From 4e8ac7d35af1ade2781406c678dbf8f5908737c6 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Sat, 2 Jan 2016 08:10:58 +0300
Subject: [PATCH 9/9] Fix window exceeding page range

Resolve issue #33
---
 .../templatetags/pagination_tags.py           |  2 +-
 linaro_django_pagination/tests/test_main.py   | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/linaro_django_pagination/templatetags/pagination_tags.py b/linaro_django_pagination/templatetags/pagination_tags.py
index 167f13a..f106942 100644
--- a/linaro_django_pagination/templatetags/pagination_tags.py
+++ b/linaro_django_pagination/templatetags/pagination_tags.py
@@ -284,7 +284,7 @@ def paginate(context, window=DEFAULT_WINDOW, margin=DEFAULT_MARGIN):
             window_end = window_end - window_start
             window_start = 0
         if window_end > paginator.num_pages:
-            window_start = window_start - (window_end - paginator.num_pages)
+            window_start = max(0, window_start - (window_end - paginator.num_pages))
             window_end = paginator.num_pages
         pages = page_range[window_start:window_end]
 
diff --git a/linaro_django_pagination/tests/test_main.py b/linaro_django_pagination/tests/test_main.py
index 1dc6d2c..2409b0f 100644
--- a/linaro_django_pagination/tests/test_main.py
+++ b/linaro_django_pagination/tests/test_main.py
@@ -209,6 +209,38 @@ def test_on_end_page_16(self):
         )
 
 
+class NoEllipsisTestCase(SimpleTestCase):
+    """
+    Tests a case where should be no any ellipsis pages.
+    """
+    def setUp(self):
+        self.p = Paginator(range(100), 25)
+
+    def test_on_start(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(1)}, 2, 0)['pages'],
+            [1, 2, 3, 4],
+        )
+
+    def test_in_middle_page_2(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(2)}, 2, 0)['pages'],
+            [1, 2, 3, 4],
+        )
+
+    def test_in_middle_page_3(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(3)}, 2, 0)['pages'],
+            [1, 2, 3, 4],
+        )
+
+    def test_on_end(self):
+        self.assertListEqual(
+            paginate({'paginator': self.p, 'page_obj': self.p.page(4)}, 2, 0)['pages'],
+            [1, 2, 3, 4],
+        )
+
+
 class SpecialTestCase(SimpleTestCase):
     def test_middle_with_no_window_and_margin_1(self):
         p = Paginator(range(31), 2)