Merge branch 'develop' into show_more_table

Author: shtalinberg

.github/workflows/tox.yml

@@ -0,0 +1,56 @@
+name: tox
+on: [push, pull_request]
+jobs:
+  tox-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - run: pip install --upgrade pip
+      - run: pip install tox
+      - run: tox -e lint  # Perhaps use ${{ job.name }}
+
+  tox-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - run: pip install --upgrade pip
+      - run: pip install tox
+      - run: tox -e docs || true  # Fix error and remove "|| true"!
+
+  tox-docs-linkcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - run: pip install --upgrade pip
+      - run: pip install tox
+      - run: tox -e docs-linkcheck || true  # Fix error and remove "|| true"!
+
+#  tox:
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        os: [ubuntu-latest]  # [macos-latest, ubuntu-latest, windows-latest]
+#        python: ['3.10']  # ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.7']
+#        django-version: ["==3.1.*", "==3.2.*", "==4.0.*"]
+#      exclude:
+#      # Django 4.0 no longer supports python 3.7
+#      - python-version: 3.7
+#        django-version: "==4.0.*"
+#    runs-on: ${{ matrix.os }}
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions/setup-python@v4
+#        with:
+#          python-version: ${{ matrix.python }}
+#      - run: pip install --upgrade pip
+#      - run: pip install tox
+#      - run: tox -e py

doc/twitter_pagination.rst

@@ -64,7 +64,7 @@ or fuction-based::
             'entry_list': Entry.objects.all(),
             'page_template': page_template,
         }
-        if request.is_ajax():
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest':
             template = page_template
         return render(request, template, context)
 

el_pagination/decorators.py

@@ -30,7 +30,7 @@ def decorated(request, *args, **kwargs):
             # Switch the template when the request is Ajax.
             querystring_key = request.GET.get(QS_KEY,
                 request.POST.get(QS_KEY, PAGE_LABEL))
-            if request.is_ajax() and querystring_key == key:
+            if request.headers.get('x-requested-with') == 'XMLHttpRequest' and querystring_key == key:
                 kwargs[TEMPLATE_VARNAME] = template
             return view(request, *args, **kwargs)
         return decorated
@@ -82,7 +82,7 @@ def decorated(request, *args, **kwargs):
             template = _get_template(querystring_key, mapping)
             extra_context['page_template'] = template
             # Switch the template when the request is Ajax.
-            if request.is_ajax() and template:
+            if request.headers.get('x-requested-with') == 'XMLHttpRequest' and template:
                 kwargs[TEMPLATE_VARNAME] = template
             return view(request, *args, **kwargs)
         return decorated

el_pagination/models.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.template import loader
-from django.utils.encoding import force_text, iri_to_uri
+from django.utils.encoding import force_str, iri_to_uri
 
 from el_pagination import loaders, settings, utils
 
@@ -32,7 +32,7 @@ def __init__(
             context=None):
         self._request = request
         self.number = number
-        self.label = force_text(number) if label is None else label
+        self.label = force_str(number) if label is None else label
         self.querystring_key = querystring_key
         self.context = context or {}
         self.context['request'] = request

el_pagination/templatetags/el_pagination_tags.py

@@ -5,7 +5,7 @@
 
 from django import template
 from django.http import Http404
-from django.utils.encoding import force_text, iri_to_uri
+from django.utils.encoding import force_str, iri_to_uri
 
 from el_pagination import models, settings, utils
 from el_pagination.paginators import DefaultPaginator, EmptyPage, LazyPaginator
@@ -701,6 +701,6 @@ def render(self, context):
             context['request'], querystring_key, default=default_number)
 
         if self.var_name is None:
-            return force_text(page_number)
+            return force_str(page_number)
         context[self.var_name] = page_number
         return ''

el_pagination/tests/test_models.py

@@ -7,7 +7,7 @@
 from django.template import Context
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from el_pagination import models as el_models
 from el_pagination import settings, utils
@@ -95,7 +95,7 @@ def check_page(
             self, page, number, is_first, is_last, is_current, label=None):
         """Perform several assertions on the given page attrs."""
         if label is None:
-            label = force_text(page.number)
+            label = force_str(page.number)
         self.assertEqual(label, page.label)
         self.assertEqual(number, page.number)
         self.assertEqual(is_first, page.is_first)
@@ -105,7 +105,7 @@ def check_page(
     def check_page_list_callable(self, callable_or_path):
         """Check the provided *page_list_callable* is actually used."""
         with local_settings(PAGE_LIST_CALLABLE=callable_or_path):
-            rendered = force_text(self.pages.get_rendered()).strip()
+            rendered = force_str(self.pages.get_rendered()).strip()
         expected = '<span class="endless_separator">...</span>'
         self.assertEqual(expected, rendered)
 
@@ -181,20 +181,20 @@ def test_total_count(self):
     def test_page_render(self):
         # Ensure the page is correctly rendered.
         page = self.pages.first()
-        rendered_page = force_text(page.render_link())
+        rendered_page = force_str(page.render_link())
         self.assertIn('href="/"', rendered_page)
         self.assertIn(page.label, rendered_page)
 
     def test_current_page_render(self):
         # Ensure the page is correctly rendered.
         page = self.pages.current()
-        rendered_page = force_text(page.render_link())
+        rendered_page = force_str(page.render_link())
         self.assertNotIn('href', rendered_page)
         self.assertIn(page.label, rendered_page)
 
     def test_page_list_render(self):
         # Ensure the page list is correctly rendered.
-        rendered = force_text(self.pages.get_rendered())
+        rendered = force_str(self.pages.get_rendered())
         self.assertEqual(5, rendered.count('<a href'))
         self.assertIn(settings.PREVIOUS_LABEL, rendered)
         self.assertIn(settings.NEXT_LABEL, rendered)
@@ -205,7 +205,7 @@ def test_page_list_render_using_arrows(self):
         page_list_callable = (
             'el_pagination.tests.test_models.page_list_callable_arrows')
         with local_settings(PAGE_LIST_CALLABLE=page_list_callable):
-            rendered = force_text(self.pages.get_rendered())
+            rendered = force_str(self.pages.get_rendered())
         self.assertEqual(7, rendered.count('<a href'))
         self.assertIn(settings.FIRST_LABEL, rendered)
         self.assertIn(settings.LAST_LABEL, rendered)
@@ -215,7 +215,7 @@ def test_page_list_render_just_one_page(self):
         page = DefaultPaginator(range(10), 10).page(1)
         pages = el_models.PageList(self.request, page, self.page_label,
                                    context=Context())
-        self.assertEqual('', force_text(pages))
+        self.assertEqual('', force_str(pages))
 
     def test_different_default_number(self):
         # Ensure the page path is generated based on the default number.

el_pagination/tests/test_utils.py

@@ -49,7 +49,7 @@ def test_default(self):
 
     def test_custom_querystring_key(self):
         # Ensure the page returned correctly reflects the ``querystring_key``.
-        request = self.factory.get('?mypage=4')
+       request = self.factory.get('?{0}=4'.format(PAGE_LABEL))  # noqa: F523
         page_number = utils.get_page_number_from_request(
             request, querystring_key='mypage')
         self.assertEqual(4, page_number)

el_pagination/views.py

@@ -152,7 +152,7 @@ def get_template_names(self):
         key = 'querystring_key'
         querystring_key = request.GET.get(key,
             request.POST.get(key, PAGE_LABEL))
-        if request.is_ajax() and querystring_key == self.key:
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest' and querystring_key == self.key:
             return [self.page_template or self.get_page_template()]
         return super(
             AjaxMultipleObjectTemplateResponseMixin, self).get_template_names()

tests/requirements.pip

@@ -6,7 +6,7 @@ coverage==4.3.4
 django-nose==1.4.6
 flake8
 isort<5.0.0
-ipdb==0.10.2
+ipdb
 nose==1.3.7
 selenium<4.0
 sphinx==1.5.5

tox.ini

@@ -30,7 +30,7 @@ setenv =
     DJANGO_TEST_PROCESSES=1
 
 [testenv:lint]
-basepython = python3.6
+basepython = python3.8
 commands =
     flake8
     isort --check-only -df
@@ -43,7 +43,7 @@ commands =
 deps =
     sphinx
     sphinx_rtd_theme
-basepython = python3.6
+basepython = python3.8
 changedir=doc
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees doc doc/_build/html
@@ -55,7 +55,7 @@ commands =
 
 [testenv:docs-linkcheck]
 deps = {[testenv:docs]deps}
-basepython = python3.6
+basepython = python3.8
 commands =
     sphinx-build -b html -d {envtmpdir}/doctrees doc doc/_build/html
     sphinx-build -b linkcheck doc doc/_build/html