Merge pull request #53 from lambdalisue/support/python35

Support Python 3.2 and 3.5

.travis.yml

@@ -1,12 +1,19 @@
 sudo: false
 language: python
+python:
+  - 2.6
+  - 2.7
+  - 3.2
+  - 3.3
+  - 3.4
+  - 3.5
 
 install:
-  - pip install tox detox
+  - pip install tox tox-travis
   - pip install coverage coveralls
 
 script:
-  - detox -r
+  - tox -r
 
 after_success:
   - coverage report

README.rst

@@ -23,7 +23,7 @@ django-permission
 Author
     Alisue <lambdalisue@hashnote.net>
 Supported python versions
-    Python 2.6, 2.7, 3.2, 3.3, 3.4
+    Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5
 Supported django versions
     Django 1.2 - 1.9
 

setup.py

@@ -39,6 +39,7 @@ def readlist(filename):
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Application Frameworks',

tests/settings.py

@@ -6,7 +6,6 @@
 sys.path.insert(0, os.path.join(BASE_DIR, 'src'))
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
@@ -60,12 +59,6 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'rbs62_^fuahxz!4k1!&yj$h8a=&-h_%do+3jk&%#v=o2%ep=7@'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -77,12 +70,6 @@
 
 ROOT_URLCONF = 'tests.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -108,13 +95,26 @@
     # Examples: "http://foo.com/media/", "/media/".
     ADMIN_MEDIA_PREFIX = '/media/'
 
-if django.VERSION >= (1, 9):
-    # add_to_builtins has removed from Django 1.9 so use OPTIONS instead
+if django.VERSION >= (1, 8):
+    # TEMPLATE_* were deprecated from Django 1.8
     TEMPLATES = [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
             'OPTIONS': {
-                'builtins': ['permission.templatetags.permissionif'],
+                'debug': DEBUG,
             },
         },
     ]
+
+    # add_to_builtins has removed from Django 1.9
+    if django.VERSION >= (1, 9):
+        TEMPLATES[0]['OPTIONS']['builtins'] = [
+            'permission.templatetags.permissionif'
+        ]
+else:
+    TEMPLATE_DEBUG = DEBUG
+    TEMPLATE_DIRS = ()
+    TEMPLATE_LOADERS = (
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+    )

tests/urls.py

@@ -1,20 +1,12 @@
-try:
-    from django.conf.urls import *
-except ImportError:
-    from django.conf.urls.defaults import *
+import django
 
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+if django.VERSION >= (1, 9):
+    urlpatterns = []
+else:
+    try:
+        from django.conf.urls import *
+    except ImportError:
+        from django.conf.urls.defaults import *
+    urlpatterns = patterns('')
 
-urlpatterns = patterns('',
-    # Example:
-    # (r'^tests/', include('tests.foo.urls')),
 
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # (r'^admin/', include(admin.site.urls)),
-)

tox.ini

@@ -2,16 +2,28 @@
 envlist =
     py26-django{12,13,14,15,16},
     py27-django{12,13,14,15,16,17,18,19},
+    py32-django{15,16,17,18},
     py33-django{15,16,17,18},
     py34-django{15,16,17,18,19},
+    py35-django{18,19},
     docs
 
+[tox:travis]
+2.6 = py26-django{12,13,14,15,16}
+2.7 = py27-django{12,13,14,15,16,17,18,19}
+3.2 = py33-django{15,16,17,18}
+3.3 = py33-django{15,16,17,18}
+3.4 = py34-django{15,16,17,18,19}
+3.5 = py35-django{18,19}, docs
+
 [testenv]
 basepython =
     py26: python2.6
     py27: python2.7
+    py32: python3.2
     py33: python3.3
     py34: python3.4
+    py35: python3.5
 deps=
     django12: django>=1.2,<1.3
     django13: django>=1.3,<1.4