Assorted fixes for Django 1.9 compatibility.

Author: aaugustin

debug_toolbar/compat.py

@@ -8,6 +8,11 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
+try:
+    from django.template.base import linebreak_iter  # NOQA
+except ImportError:  # Django < 1.9
+    from django.views.debug import linebreak_iter  # NOQA
+
 try:
     from django.template.engine import Engine
 except ImportError:  # Django < 1.8

debug_toolbar/utils.py

@@ -13,7 +13,8 @@
 from django.utils.encoding import force_text
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
-from django.views.debug import linebreak_iter
+
+from debug_toolbar.compat import linebreak_iter
 
 from .settings import CONFIG
 

tests/loaders.py

@@ -1,10 +1,17 @@
+import django
 from django.contrib.auth.models import User
 from django.template.loaders.app_directories import Loader
 
 
 class LoaderWithSQL(Loader):
-    def load_template_source(self, template_name, template_dirs=None):
-        # Force the template loader to run some SQL. Simulates a CMS.
-        User.objects.all().count()
-        return super(LoaderWithSQL, self).load_template_source(
-            template_name, template_dirs=template_dirs)
+
+    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)

tests/panels/test_redirects.py

@@ -28,27 +28,36 @@ def test_redirect(self):
         redirect['Location'] = 'http://somewhere/else/'
         response = self.panel.process_response(self.request, redirect)
         self.assertFalse(response is redirect)
-        self.assertContains(response, '302 FOUND')
+        try:
+            self.assertContains(response, '302 Found')
+        except AssertionError:  # Django < 1.9
+            self.assertContains(response, '302 FOUND')
         self.assertContains(response, 'http://somewhere/else/')
 
     def test_redirect_with_broken_context_processor(self):
-        context_processors = settings.TEMPLATE_CONTEXT_PROCESSORS + (
+        context_processors = list(settings.TEMPLATE_CONTEXT_PROCESSORS) + [
             'tests.context_processors.broken',
-        )
+        ]
 
         with self.settings(TEMPLATE_CONTEXT_PROCESSORS=context_processors):
             redirect = HttpResponse(status=302)
             redirect['Location'] = 'http://somewhere/else/'
             response = self.panel.process_response(self.request, redirect)
             self.assertFalse(response is redirect)
-            self.assertContains(response, '302 FOUND')
+            try:
+                self.assertContains(response, '302 Found')
+            except AssertionError:  # Django < 1.9
+                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)
-        self.assertContains(response, '369 UNKNOWN STATUS CODE')
+        try:
+            self.assertContains(response, '369 Unknown Status Code')
+        except AssertionError:  # Django < 1.9
+            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_sql.py

@@ -121,10 +121,9 @@ def test_regression_infinite_recursion(self):
 
         render(self.request, "basic.html", {})
 
-        # ensure queries were logged
-        # It's more than one because the SQL run in the loader is run every time
-        # the template is rendered which is more than once.
-        self.assertEqual(len(self.panel._queries), 3)
+        # Two queries are logged because the loader runs SQL every time a
+        # template is loaded and basic.html extends base.html.
+        self.assertEqual(len(self.panel._queries), 2)
         query = self.panel._queries[0]
         self.assertEqual(query[0], 'default')
         self.assertTrue('sql' in query[1])

tests/settings.py

@@ -11,6 +11,8 @@
 
 INTERNAL_IPS = ['127.0.0.1']
 
+LOGGING_CONFIG = None   # avoids spurious output in tests
+
 
 # Application definition