Drop support for Django < 1.11 and remove workarounds

Per Django's recommendation, now that django-debug-toolbar supports 2.0,
it should drop support for Django < 1.11 to ease maintenance and
compatibility across Django versions. So long as no deprecation warnings
are produced, django-debug-toolbar should remain forward compatible with
the next Django version.

For more details, see the Django docs:

https://docs.djangoproject.com/en/2.0/releases/2.0/#third-party-library-support-for-older-version-of-django

> Third-party library support for older version of Django
>
> Following the release of Django 2.0, we suggest that third-party app authors
> drop support for all versions of Django prior to 1.11. At that time, you
> should be able to run your package’s tests using python -Wd so that
> deprecation warnings do appear. After making the deprecation warning fixes,
> your app should be compatible with Django 2.0.

Those wishing to continue using an older Django can pin the version
django-debug-toolbar.

Author: jdufresne

.travis.yml

@@ -3,24 +3,6 @@ sudo: false
 cache: pip
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27-dj18
-    - python: 3.3
-      env: TOXENV=py33-dj18
-    - python: 3.4
-      env: TOXENV=py34-dj18
-    - python: 2.7
-      env: TOXENV=py27-dj19
-    - python: 3.4
-      env: TOXENV=py34-dj19
-    - python: 3.5
-      env: TOXENV=py35-dj19
-    - python: 2.7
-      env: TOXENV=py27-dj110
-    - python: 3.4
-      env: TOXENV=py34-dj110
-    - python: 3.5
-      env: TOXENV=py35-dj110
     - python: 2.7
       env: TOXENV=py27-dj111
     - python: 3.4

README.rst

@@ -31,7 +31,7 @@ Here's a screenshot of the toolbar in action:
 In addition to the built-in panels, a number of third-party panels are
 contributed by the community.
 
-The current version of the Debug Toolbar is 1.9. It works on Django ≥ 1.8.
+The current version of the Debug Toolbar is 1.9. It works on Django ≥ 1.11.
 
 Documentation, including installation and configuration instructions, is
 available at https://django-debug-toolbar.readthedocs.io/.

debug_toolbar/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-import django
-
 __all__ = ['VERSION']
 
 
@@ -14,9 +12,6 @@
 
 # Code that discovers files or modules in INSTALLED_APPS imports this module.
 
-if django.VERSION < (1, 9):
-    urls = 'debug_toolbar.toolbar', 'djdt', 'djdt'
-else:
-    urls = 'debug_toolbar.toolbar', 'djdt'
+urls = 'debug_toolbar.toolbar', 'djdt'
 
 default_app_config = 'debug_toolbar.apps.DebugToolbarConfig'

debug_toolbar/compat.py

@@ -9,20 +9,14 @@
 
 from django.conf import settings
 from django.utils import six
+from django.utils.deprecation import MiddlewareMixin
 from django.utils.encoding import force_text
 from django.utils.lru_cache import lru_cache
 from django.utils.module_loading import import_string
 
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.toolbar import DebugToolbar
 
-try:
-    from django.utils.deprecation import MiddlewareMixin
-except ImportError:  # Django < 1.10
-    # Works perfectly for everyone using MIDDLEWARE_CLASSES
-    MiddlewareMixin = object
-
-
 _HTML_TYPES = ('text/html', 'application/xhtml+xml')
 
 

debug_toolbar/middleware.py

@@ -5,7 +5,6 @@
 import time
 from collections import OrderedDict
 
-import django
 from django.conf import settings
 from django.core import cache
 from django.core.cache import CacheHandler, caches as original_caches
@@ -20,9 +19,6 @@
     get_stack, get_template_info, render_stacktrace, tidy_stacktrace,
 )
 
-if django.VERSION[:2] < (1, 9):
-    from django.core.cache import get_cache as original_get_cache
-
 cache_called = Signal(providing_args=[
     "time_taken", "name", "return_value", "args", "kwargs", "trace"])
 
@@ -121,24 +117,12 @@ def decr_version(self, *args, **kwargs):
         return self.cache.decr_version(*args, **kwargs)
 
 
-if django.VERSION[:2] < (1, 9):
-    def get_cache(*args, **kwargs):
-        return CacheStatTracker(original_get_cache(*args, **kwargs))
-
-
 class CacheHandlerPatch(CacheHandler):
     def __getitem__(self, alias):
         actual_cache = super(CacheHandlerPatch, self).__getitem__(alias)
         return CacheStatTracker(actual_cache)
 
 
-# Must monkey patch the middleware's cache module as well in order to
-# cover per-view level caching. This needs to be monkey patched outside
-# of the enable_instrumentation method since the django's
-# decorator_from_middleware_with_args will store the cache from core.caches
-# when it wraps the view.
-if django.VERSION[:2] < (1, 9):
-    middleware_cache.get_cache = get_cache
 middleware_cache.caches = CacheHandlerPatch()
 
 
@@ -219,16 +203,12 @@ def title(self):
                          count) % dict(count=count)
 
     def enable_instrumentation(self):
-        if django.VERSION[:2] < (1, 9):
-            cache.get_cache = get_cache
         if isinstance(middleware_cache.caches, CacheHandlerPatch):
             cache.caches = middleware_cache.caches
         else:
             cache.caches = CacheHandlerPatch()
 
     def disable_instrumentation(self):
-        if django.VERSION[:2] < (1, 9):
-            cache.get_cache = original_get_cache
         cache.caches = original_caches
         # While it can be restored to the original, any views that were
         # wrapped with the cache_page decorator will continue to use a

debug_toolbar/panels/cache.py

@@ -1,17 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.http import Http404
+from django.urls import resolve
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from debug_toolbar.panels import Panel
 from debug_toolbar.utils import get_name_from_obj
 
-try:
-    from django.urls import resolve
-except ImportError:  # Django < 1.10 pragma: no cover
-    from django.core.urlresolvers import resolve
-
 
 class RequestPanel(Panel):
     """

debug_toolbar/panels/request.py

@@ -2,18 +2,13 @@
 
 from django.core import signing
 from django.http import HttpResponseBadRequest
-from django.template import TemplateDoesNotExist
+from django.template import Origin, TemplateDoesNotExist
 from django.template.engine import Engine
 from django.template.response import SimpleTemplateResponse
 from django.utils.safestring import mark_safe
 
 from debug_toolbar.decorators import require_show_toolbar
 
-try:
-    from django.template import Origin
-except ImportError:
-    Origin = None
-
 
 @require_show_toolbar
 def template_source(request):
@@ -44,19 +39,12 @@ def template_source(request):
                 final_loaders.append(loader)
 
     for loader in final_loaders:
-        if Origin:  # django>=1.9
-            origin = Origin(template_origin_name)
-            try:
-                source = loader.get_contents(origin)
-                break
-            except TemplateDoesNotExist:
-                pass
-        else:  # django<1.9
-            try:
-                source, _ = loader.load_template_source(template_name)
-                break
-            except TemplateDoesNotExist:
-                pass
+        origin = Origin(template_origin_name)
+        try:
+            source = loader.get_contents(origin)
+            break
+        except TemplateDoesNotExist:
+            pass
     else:
         source = "Template Does Not Exist: %s" % (template_origin_name,)
 

debug_toolbar/panels/templates/views.py

@@ -16,7 +16,6 @@
 from django.utils.safestring import mark_safe
 
 from debug_toolbar import settings as dt_settings
-from debug_toolbar.compat import linebreak_iter
 
 try:
     import threading
@@ -116,15 +115,8 @@ def get_template_info():
 
 
 def get_template_context(node, context, context_lines=3):
-    source = getattr(node, 'source', None)
-    # In Django 1.9 template Node does not have source property, Origin does
-    # not reload method, so we extract contextual information from exception
-    # info.
-    if source:
-        line, source_lines, name = get_template_source_from_source(source)
-    else:
-        line, source_lines, name = get_template_source_from_exception_info(
-            node, context)
+    line, source_lines, name = get_template_source_from_exception_info(
+        node, context)
     debug_context = []
     start = max(1, line - context_lines)
     end = line + 1 + context_lines
@@ -143,26 +135,6 @@ def get_template_context(node, context, context_lines=3):
     }
 
 
-def get_template_source_from_source(source):
-    line = 0
-    upto = 0
-    source_lines = []
-    # before = during = after = ""
-
-    origin, (start, end) = source
-    template_source = origin.reload()
-
-    for num, next in enumerate(linebreak_iter(template_source)):
-        if start >= upto and end <= next:
-            line = num
-            # before = template_source[upto:start]
-            # during = template_source[start:end]
-            # after = template_source[end:next]
-        source_lines.append((num, template_source[upto:next]))
-        upto = next
-    return line, source_lines, origin.name
-
-
 def get_template_source_from_exception_info(node, context):
     exception_info = context.template.get_exception_info(
         Exception('DDT'), node.token)

debug_toolbar/utils.py

@@ -1,6 +1,11 @@
 Change log
 ==========
 
+UNRELEASED
+----------
+
+* Removed support for Django < 1.11.
+
 1.9.1 (2017-11-15)
 ------------------
 

docs/changes.rst

@@ -17,7 +17,7 @@
     license='BSD',
     packages=find_packages(exclude=('tests.*', 'tests', 'example')),
     install_requires=[
-        'Django>=1.8',
+        'Django>=1.11',
         'sqlparse>=0.2.0',
     ],
     include_package_data=True,
@@ -26,9 +26,6 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
@@ -38,7 +35,6 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',

setup.py

@@ -1,17 +1,9 @@
-import django
 from django.contrib.auth.models import User
 from django.template.loaders.app_directories import Loader
 
 
 class LoaderWithSQL(Loader):
-
-    if django.VERSION[:2] >= (1, 9):
-        def get_template(self, *args, **kwargs):
-            # Force the template loader to run some SQL. Simulates a CMS.
-            User.objects.all().count()
-            return super(LoaderWithSQL, self).get_template(*args, **kwargs)
-    else:
-        def load_template(self, *args, **kwargs):
-            # Force the template loader to run some SQL. Simulates a CMS.
-            User.objects.all().count()
-            return super(LoaderWithSQL, self).load_template(*args, **kwargs)
+    def get_template(self, *args, **kwargs):
+        # Force the template loader to run some SQL. Simulates a CMS.
+        User.objects.all().count()
+        return super(LoaderWithSQL, self).get_template(*args, **kwargs)

tests/loaders.py

@@ -1,7 +1,4 @@
 def simple_middleware(get_response):
-    """
-    Used to test Django 1.10 compatibility.
-    """
     def middleware(request):
         return get_response(request)
     return middleware

tests/middleware.py

@@ -28,10 +28,7 @@ def test_redirect(self):
         redirect['Location'] = 'http://somewhere/else/'
         response = self.panel.process_response(self.request, redirect)
         self.assertFalse(response is redirect)
-        try:
-            self.assertContains(response, '302 Found')
-        except AssertionError:  # Django < 1.9
-            self.assertContains(response, '302 FOUND')
+        self.assertContains(response, '302 Found')
         self.assertContains(response, 'http://somewhere/else/')
 
     def test_redirect_with_broken_context_processor(self):
@@ -43,20 +40,14 @@ def test_redirect_with_broken_context_processor(self):
             redirect['Location'] = 'http://somewhere/else/'
             response = self.panel.process_response(self.request, redirect)
             self.assertFalse(response is redirect)
-            try:
-                self.assertContains(response, '302 Found')
-            except AssertionError:  # Django < 1.9
-                self.assertContains(response, '302 FOUND')
+            self.assertContains(response, '302 Found')
             self.assertContains(response, 'http://somewhere/else/')
 
     def test_unknown_status_code(self):
         redirect = HttpResponse(status=369)
         redirect['Location'] = 'http://somewhere/else/'
         response = self.panel.process_response(self.request, redirect)
-        try:
-            self.assertContains(response, '369 Unknown Status Code')
-        except AssertionError:  # Django < 1.9
-            self.assertContains(response, '369 UNKNOWN STATUS CODE')
+        self.assertContains(response, '369 Unknown Status Code')
 
     def test_unknown_status_code_with_reason(self):
         redirect = HttpResponse(status=369, reason='Look Ma!')

tests/panels/test_redirects.py

@@ -40,8 +40,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
-# Django < 1.10
-MIDDLEWARE_CLASSES = MIDDLEWARE
 
 ROOT_URLCONF = 'tests.urls'
 

tests/settings.py

@@ -387,7 +387,7 @@ def test_check_gzip_middleware_error(self):
     def test_middleware_factory_functions_supported(self):
         messages = run_checks()
 
-        if django.VERSION[:2] < (1, 10) or django.VERSION[:2] >= (2, 0):
+        if django.VERSION[:2] >= (2, 0):
             self.assertEqual(messages, [])
         else:
             self.assertEqual(messages[0].id, '1_10.W001')