fix

Author: domdinicola

.github/workflows/tests.yml

@@ -24,8 +24,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: [ "3.9", "3.10", "3.11"]
-                django-version: [ "3.2", "4.2"]
+                python-version: [ "3.9", "3.10", "3.11", "3.12, "3.13"]
+                django-version: [ "3.2", "4.2", "5.1"]
         env:
             PY_VER: ${{ matrix.python-version}}
             DJ_VER: ${{ matrix.django-version}}

.travis.yml

@@ -4,21 +4,6 @@ dist: bionic
 
 matrix:
     fast_finish: true
-    include:
-      - { python: "3.6", env: DJANGO=1.11 }
-      - { python: "3.6", env: DJANGO=2.1 }
-      - { python: "3.6", env: DJANGO=2.2 }
-      - { python: "3.6", env: DJANGO=3.0 }
-
-      - { python: "3.7", env: DJANGO=1.11 }
-      - { python: "3.7", env: DJANGO=2.1 }
-      - { python: "3.7", env: DJANGO=2.2 }
-      - { python: "3.7", env: DJANGO=3.0 }
-      - { python: "3.7", env: DJANGO=master }
-
-      - { python: "3.8", env: DJANGO=2.2 }
-      - { python: "3.8", env: DJANGO=3.0 }
-      - { python: "3.8", env: DJANGO=master }
 
 install:
   - pip install tox tox-venv tox-travis pip wheel codecov -U

docs/conf.py

@@ -12,207 +12,210 @@
 # serve to show the default.
 
 import datetime
-import sys, os
 import selectable
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'Django-Selectable'
-copyright = u'2011-%s, Mark Lavin' % datetime.date.today().year
+project = "Django-Selectable"
+copyright = "2011-%s, Mark Lavin" % datetime.date.today().year
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '.'.join(selectable.__version__.split('.')[0:2])
+version = ".".join(selectable.__version__.split(".")[0:2])
 # The full version, including alpha/beta/rc tags.
 release = selectable.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Django-Selectabledoc'
+htmlhelp_basename = "Django-Selectabledoc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+# latex_paper_size = 'letter'
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Django-Selectable.tex', u'Django-Selectable Documentation',
-   u'Mark Lavin', 'manual'),
+    (
+        "index",
+        "Django-Selectable.tex",
+        "Django-Selectable Documentation",
+        "Mark Lavin",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+# latex_preamble = ''
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'django-selectable', u'Django-Selectable Documentation',
-     [u'Mark Lavin'], 1)
+    ("index", "django-selectable", "Django-Selectable Documentation", ["Mark Lavin"], 1)
 ]

example/example/wsgi.py

@@ -13,6 +13,7 @@
 framework.
 
 """
+
 import os
 
 from django.core.wsgi import get_wsgi_application

selectable/__init__.py

@@ -1,6 +1,5 @@
 "Auto-complete selection widgets using Django and jQuery UI."
 
-
 __version__ = "1.4.0"
 
 default_app_config = "selectable.apps.SelectableConfig"

selectable/base.py

@@ -1,4 +1,5 @@
 "Base classes for lookup creation."
+
 import operator
 import re
 from functools import reduce

selectable/decorators.py

@@ -1,4 +1,5 @@
 "Decorators for additional lookup functionality."
+
 from functools import wraps
 
 from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden
@@ -43,7 +44,7 @@ def inner(self, request):
 @results_decorator
 def ajax_required(request):
     "Lookup decorator to require AJAX calls to the lookup view."
-    if not request.is_ajax():
+    if not request.headers.get("x-requested-with") == "XMLHttpRequest":
         return HttpResponseBadRequest()
 
 

selectable/forms/fields.py

@@ -5,7 +5,10 @@
 from django.utils.translation import gettext_lazy as _
 
 from selectable.forms.base import import_lookup_class
-from selectable.forms.widgets import AutoCompleteSelectMultipleWidget, AutoCompleteSelectWidget
+from selectable.forms.widgets import (
+    AutoCompleteSelectMultipleWidget,
+    AutoCompleteSelectWidget,
+)
 
 __all__ = (
     "AutoCompleteSelectField",

selectable/registry.py

@@ -2,7 +2,11 @@
 from django.utils.module_loading import autodiscover_modules
 
 from selectable.base import LookupBase
-from selectable.exceptions import LookupAlreadyRegistered, LookupInvalid, LookupNotRegistered
+from selectable.exceptions import (
+    LookupAlreadyRegistered,
+    LookupInvalid,
+    LookupNotRegistered,
+)
 
 
 class LookupRegistry:

selectable/tests/test_decorators.py

@@ -16,15 +16,13 @@ def setUp(self):
 
     def test_ajax_call(self):
         "Ajax call should yield a successful response."
-        request = Mock()
-        request.is_ajax = lambda: True
+        request = Mock(headers={"x-requested-with": "XMLHttpRequest"})
         response = self.lookup.results(request)
         self.assertTrue(response.status_code, 200)
 
     def test_non_ajax_call(self):
         "Non-Ajax call should yield a bad request response."
         request = Mock()
-        request.is_ajax = lambda: False
         response = self.lookup.results(request)
         self.assertEqual(response.status_code, 400)