Merge pull request #1 from PolicyStat/issue_1

Add support for django 1.11

.travis.yml

@@ -10,6 +10,7 @@ env:
   - TOXENV=py33-dj18
   - TOXENV=py34-dj18
   - TOXENV=py35-dj18
+  - TOXENV=py27-dj111
 install:
 - pip install tox codecov
 script: tox -v

example/exampleapp/permissions.py

@@ -7,7 +7,7 @@ from authority.permissions import BasePermission
 class FlatPagePermission(BasePermission):
     """
     This class contains a bunch of checks:
-    
+
     1. the default checks 'add_flatpage', 'browse_flatpage',
        'change_flatpage' and 'delete_flatpage'
     2. the custom checks:
@@ -49,4 +49,4 @@ class FlatPagePermission(BasePermission):
         return False
     top_secret.short_description=_('Is allowed to see top secret flatpages')
 
-authority.register(FlatPage, FlatPagePermission)
+authority.sites.register(FlatPage, FlatPagePermission)

example/urls.py

@@ -1,39 +1,42 @@
-try:
-    from django.conf.urls import patterns, include, handler500, url
-except ImportError:  # django < 1.4
-    from django.conf.urls.defaults import patterns, include, handler500, url
+import django.contrib.auth.views
+from django.conf.urls import include, handler500, url
 from django.conf import settings
-from django.contrib import admin
-import authority
 
-admin.autodiscover()
-authority.autodiscover()
-
-handler500 # Pyflakes
+import authority.views
+import authority.urls
+import example.exampleapp.views
 
 from exampleapp.forms import SpecialUserPermissionForm
 
-urlpatterns = patterns('',
-    (r'^admin/(.*)', admin.site.root),
-    #('^admin/', include(admin.site.urls)),
-    url(r'^authority/permission/add/(?P<app_label>[\w\-]+)/(?P<module_name>[\w\-]+)/(?P<pk>\d+)/$',
-        view='authority.views.add_permission',
+authority.autodiscover()
+
+handler500  # flake8
+
+urlpatterns = (
+    url(
+        r'^authority/permission/add/(?P<app_label>[\w\-]+)/(?P<module_name>[\w\-]+)/(?P<pk>\d+)/$',  # noqa
+        view=authority.views.add_permission,
         name="authority-add-permission",
         kwargs={'approved': True, 'form_class': SpecialUserPermissionForm}
     ),
-    url(r'^request/add/(?P<app_label>[\w\-]+)/(?P<module_name>[\w\-]+)/(?P<pk>\d+)/$',
-        view='authority.views.add_permission',
+    url(
+        r'^request/add/(?P<app_label>[\w\-]+)/(?P<module_name>[\w\-]+)/(?P<pk>\d+)/$',  # noqa
+        view=authority.views.add_permission,
         name="authority-add-permission-request",
         kwargs={'approved': False, 'form_class': SpecialUserPermissionForm}
     ),
-    (r'^authority/', include('authority.urls')),
-    (r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    url(r'^(?P<url>[\/0-9A-Za-z]+)$', 'example.exampleapp.views.top_secret', {'lala': 'oh yeah!'}),
+    url(r'^authority/', include(authority.urls)),
+    url(r'^accounts/login/$', django.contrib.auth.views.login),
+    url(
+        r'^(?P<url>[\/0-9A-Za-z]+)$',
+        example.exampleapp.views.top_secret,
+        {'lala': 'oh yeah!'},
+    ),
 )
 
 if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+    urlpatterns += (
+        url(r'^media/(?P<path>.*)$', django.views.static.serve, {
             'document_root': settings.MEDIA_ROOT,
         }),
     )

example/users/models.py

@@ -7,6 +7,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['first_name', 'last_name']
 
+    username = models.CharField(max_length=100)
     first_name = models.CharField(max_length=50)
     last_name = models.CharField(max_length=50)
     email = models.EmailField(unique=True)

tox.ini

@@ -3,7 +3,7 @@ skipsdist = True
 usedevelop = True
 minversion = 1.8
 envlist =
-    py{27,33,34,35}-dj{18,19,110}
+    py{27,33,34,35}-dj{18,19,110,111}
 
 [testenv]
 basepython =
@@ -17,3 +17,4 @@ deps =
     dj18: Django<1.9
     dj19: Django<1.10
     dj110: Django<1.11
+    dj111: Django<1.12