48 django 1.10 compatibility

runtests.py

@@ -40,6 +40,27 @@
             "django.core.context_processors.request",
             "treenav.context_processors.treenav_active",
         ),
+        TEMPLATES=[
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'DIRS': [],
+                'APP_DIRS': True,
+                'OPTIONS': {
+                    'context_processors': [
+                        'django.contrib.auth.context_processors.auth',
+                        'django.template.context_processors.debug',
+                        'django.template.context_processors.i18n',
+                        'django.template.context_processors.media',
+                        'django.template.context_processors.static',
+                        'django.template.context_processors.tz',
+                        'django.contrib.messages.context_processors.messages',
+                        "django.template.context_processors.request",
+                        "treenav.context_processors.treenav_active",
+                    ],
+                },
+            },
+        ],
+
         SECRET_KEY='this-is-just-for-tests-so-not-that-secret',
         ROOT_URLCONF='treenav.tests.urls',
     )

treenav/templates/admin/treenav/menuitem/change_list.html

@@ -1,6 +1,5 @@
 {% extends "admin/mptt_change_list.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block object-tools-items %}
     <li>

treenav/templates/treenav/menucrumbs.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 {% if active_menu_items %}
     <ul>
         {% for item in active_menu_items %}

treenav/templatetags/treenav_tags.py

@@ -1,7 +1,6 @@
 from django import template
 from django.core.cache import cache
 from django.template.loader import render_to_string
-from django.template import RequestContext, Context
 
 from treenav.models import MenuItem
 from treenav.templatetags import CaktNode, parse_args_kwargs
@@ -25,9 +24,9 @@ def get_menu_item(slug):
 def new_context(parent_context):
     """ Create new context rather than modifying parent context """
     if 'request' in parent_context:
-        return RequestContext(parent_context['request'])
+        return {'request': parent_context['request']}
     else:
-        return Context()
+        return {}
 
 
 class SingleLevelMenuNode(CaktNode):

treenav/tests/test_views.py

@@ -5,6 +5,7 @@
 from django.http import HttpRequest
 from django.template.context import Context
 from django.template import Template
+from django.test import override_settings
 
 from .base import TreeNavTestCase as TestCase
 from treenav.context_processors import treenav_active
@@ -13,10 +14,9 @@
 from treenav.tests import Team
 
 
+@override_settings(ROOT_URLCONF='treenav.tests.urls')
 class TreeNavTestCase(TestCase):
 
-    urls = 'treenav.tests.urls'
-
     def setUp(self):
         self.root = self.create_menu_item(**{
             'label': 'Primary Navigation',
@@ -177,10 +177,9 @@ def test_active_url(self):
         self.assertEqual(active_item.node, self.child)
 
 
+@override_settings(ROOT_URLCONF='treenav.tests.urls')
 class TreeNavViewTestCase(TestCase):
 
-    urls = 'treenav.tests.urls'
-
     def setUp(self):
         self.root = self.create_menu_item(
             label='Primary Navigation',
@@ -251,11 +250,10 @@ def test_undefined_url(self):
         self.assertEqual(response.status_code, 404)
 
 
+@override_settings(ROOT_URLCONF='treenav.tests.urls')
 class RefreshViewTestCase(TestCase):
     "Admin view to trigger refresh of hrefs."
 
-    urls = 'treenav.tests.urls'
-
     def setUp(self):
         self.superuser = User.objects.create_user('test', '', 'test')
         self.superuser.is_staff = True
@@ -298,11 +296,10 @@ def test_no_permission(self):
         self.assertEqual(len(response.context['messages']), 0)
 
 
+@override_settings(ROOT_URLCONF='treenav.tests.urls')
 class ClearCacheViewTestCase(TestCase):
     "Admin view to clear menu cache."
 
-    urls = 'treenav.tests.urls'
-
     def setUp(self):
         self.superuser = User.objects.create_user('test', '', 'test')
         self.superuser.is_staff = True
@@ -341,10 +338,9 @@ def test_no_permission(self):
         self.assertEqual(len(response.context['messages']), 0)
 
 
+@override_settings(ROOT_URLCONF='treenav.tests.urls')
 class SimultaneousReorderTestCase(TestCase):
 
-    urls = 'treenav.tests.urls'
-
     def setUp(self):
         self.root = self.create_menu_item(
             label='Primary Navigation',