Merge pull request #140 from joehybird/master

Fix compatibility from django1.5 to django1.11 with python 2.7 and 3.x

.travis.yml

@@ -1,23 +1,28 @@
 language: python
+python:
+  - "3.5"
 env:
   - TOXENV=py27-django15
   - TOXENV=py27-django16
   - TOXENV=py27-django17
   - TOXENV=py27-django18
   - TOXENV=py27-django19
-  - TOXENV=py33-django15
-  - TOXENV=py33-django16
-  - TOXENV=py33-django17
+  - TOXENV=py27-django110
+  - TOXENV=py27-django111
   - TOXENV=py34-django15
   - TOXENV=py34-django16
   - TOXENV=py34-django17
   - TOXENV=py34-django18
   - TOXENV=py34-django19
+  - TOXENV=py34-django110
+  - TOXENV=py34-django111
   - TOXENV=py35-django18
   - TOXENV=py35-django19
+  - TOXENV=py34-django110
+  - TOXENV=py34-django111
   - TOXENV=flake8
-  - TOXENV=sphinx
-  - TOXENV=readme
+#  - TOXENV=sphinx
+#  - TOXENV=readme
 install:
 script:
   - make test

demo/demoproject/apache/urls.py

@@ -1,13 +1,16 @@
 """URL mapping."""
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+
+from demoproject.apache import views
+from demoproject.urlpatterns import patterns
 
 
 urlpatterns = patterns(
     'demoproject.apache.views',
     url(r'^optimized-by-middleware/$',
-        'optimized_by_middleware',
+        views.optimized_by_middleware,
         name='optimized_by_middleware'),
     url(r'^optimized-by-decorator/$',
-        'optimized_by_decorator',
+        views.optimized_by_decorator,
         name='optimized_by_decorator'),
 )

demo/demoproject/http/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from demoproject.http import views
-
+from demoproject.urlpatterns import patterns
 
 urlpatterns = patterns(
     '',

demo/demoproject/lighttpd/urls.py

@@ -1,13 +1,16 @@
 """URL mapping."""
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+
+from demoproject.lighttpd import views
+from demoproject.urlpatterns import patterns
 
 
 urlpatterns = patterns(
     'demoproject.lighttpd.views',
     url(r'^optimized-by-middleware/$',
-        'optimized_by_middleware',
+        views.optimized_by_middleware,
         name='optimized_by_middleware'),
     url(r'^optimized-by-decorator/$',
-        'optimized_by_decorator',
+        views.optimized_by_decorator,
         name='optimized_by_decorator'),
 )

demo/demoproject/nginx/urls.py

@@ -1,13 +1,17 @@
 """URL mapping."""
-from django.conf.urls import patterns, url
+
+from django.conf.urls import url
+
+from demoproject.nginx import views
+from demoproject.urlpatterns import patterns
 
 
 urlpatterns = patterns(
     'demoproject.nginx.views',
     url(r'^optimized-by-middleware/$',
-        'optimized_by_middleware',
+        views.optimized_by_middleware,
         name='optimized_by_middleware'),
     url(r'^optimized-by-decorator/$',
-        'optimized_by_decorator',
+        views.optimized_by_decorator,
         name='optimized_by_decorator'),
 )

demo/demoproject/object/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from demoproject.object import views
-
+from demoproject.urlpatterns import patterns
 
 urlpatterns = patterns(
     '',

demo/demoproject/path/urls.py

@@ -1,7 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from demoproject.path import views
-
+from demoproject.urlpatterns import patterns
 
 urlpatterns = patterns(
     '',

demo/demoproject/settings.py

@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
 """Django settings for django-downloadview demo project."""
+
+from distutils.version import StrictVersion
 import os
 
+from django.utils.version import get_version
+
 
 # Configure some relative directories.
 demoproject_dir = os.path.dirname(os.path.abspath(__file__))
@@ -112,7 +116,6 @@ DOWNLOADVIEW_RULES += [
 
 # Test/development settings.
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 NOSE_ARGS = [
     '--verbosity=2',
@@ -122,3 +125,32 @@ NOSE_ARGS = [
     '--with-coverage',
     '--with-doctest',
 ]
+
+if StrictVersion(get_version()) >= StrictVersion('1.8'):
+    TEMPLATES = [
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'DIRS': [
+                os.path.join(os.path.dirname(__file__), "templates"),
+            ],
+            'OPTIONS': {
+                'debug': DEBUG,
+                'context_processors': [
+                    # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this
+                    # list if you haven't customized them:
+                    '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',
+                ],
+            },
+        },
+    ]
+else:
+    TEMPLATE_DEBUG = DEBUG
+    TEMPLATE_DIRS = (
+        os.path.join(os.path.dirname(__file__), "templates"),
+    )

demo/demoproject/storage/urls.py

@@ -1,6 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from demoproject.storage import views
+from demoproject.urlpatterns import patterns
 
 
 urlpatterns = patterns(

demo/demoproject/urlpatterns.py

@@ -0,0 +1,5 @@
+try:
+    from django.conf.urls import patterns
+except:
+    def patterns(prefix, *args):
+        return list(args)

demo/demoproject/urls.py

@@ -1,6 +1,8 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.views.generic import TemplateView
 
+from demoproject.urlpatterns import patterns
+
 
 home = TemplateView.as_view(template_name='home.html')
 

demo/demoproject/virtual/urls.py

@@ -1,6 +1,7 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from demoproject.virtual import views
+from demoproject.urlpatterns import patterns
 
 
 urlpatterns = patterns(

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27}-django{15,16,17,18,19}, py{33,34}-django{15,16,17}, py{34,35}-django{18,19}, flake8, sphinx, readme
+envlist = py{27}-django{15,16,17,18,19,110,111}, py{33,34}-django{15,16,17}, py{34,35}-django{18,19,110,111}, flake8, sphinx, readme
 
 [testenv]
 basepython =
@@ -10,10 +10,19 @@ basepython =
 deps =
     coverage
     django15: Django>=1.5,<1.6
+    django15: django-nose<1.4.3
     django16: Django>=1.6,<1.7
+    django16: django-nose<1.4.3
     django17: Django>=1.7,<1.8
+    django17: django-nose<1.4.3
     django18: Django>=1.8,<1.9
+    django18: django-nose>=1.4.2
     django19: Django>=1.9,<1.10
+    django19: django-nose>=1.4.3
+    django110: Django>=1.10,<1.11
+	django110: django-nose>=1.4.4
+    django111: Django>=1.11,<2.0
+    django111: django-nose>=1.4.5
     nose
     py27: mock
 commands =