urlpatterns are now plain lists

Author: silvanocerza

README.rst

@@ -72,10 +72,10 @@ Notice that `oauth2_provider` namespace is mandatory.
 
 .. code-block:: python
 
-    urlpatterns = patterns(
+    urlpatterns = [
         ...
         url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
-    )
+    ]
 
 Documentation
 --------------

docs/install.rst

@@ -19,10 +19,10 @@ If you need an OAuth2 provider you'll want to add the following to your urls.py
 
 .. code-block:: python
 
-    urlpatterns = patterns(
+    urlpatterns = [
         ...
         url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
-    )
+    ]
 
 Sync your database
 ------------------

docs/rest-framework/getting_started.rst

@@ -48,7 +48,7 @@ Here's our project's root `urls.py` module:
 
 .. code-block:: python
 
-    from django.conf.urls import url, patterns, include
+    from django.conf.urls import url, include
     from django.contrib.auth.models import User, Group
     from django.contrib import admin
     admin.autodiscover()
@@ -91,11 +91,11 @@ Here's our project's root `urls.py` module:
 
     # Wire up our API using automatic URL routing.
     # Additionally, we include login URLs for the browseable API.
-    urlpatterns = patterns('',
+    urlpatterns = [
         url(r'^', include(router.urls)),
         url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
         url(r'^admin/', include(admin.site.urls)),
-    )
+    ]
 
 Also add the following to your `settings.py` module:
 

docs/tutorial/tutorial_01.rst

@@ -33,12 +33,11 @@ Include the Django OAuth Toolkit urls in your `urls.py`, choosing the urlspace y
 
 .. code-block:: python
 
-    urlpatterns = patterns(
-        '',
+    urlpatterns = [
         url(r'^admin/', include(admin.site.urls)),
         url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
         # ...
-    )
+    ]
 
 Include the CORS middleware in your `settings.py`:
 

docs/tutorial/tutorial_02.rst

@@ -34,7 +34,7 @@ URL this view will respond to:
 
 .. code-block:: python
 
-    from django.conf.urls import patterns, url
+    from django.conf.urls import url
     import oauth2_provider.views as oauth2_views
     from django.conf import settings
     from .views import ApiEndpoint

docs/tutorial/tutorial_03.rst

@@ -65,11 +65,10 @@ To check everything works properly, mount the view above to some url:
 
 .. code-block:: python
 
-    urlpatterns = patterns(
-        '',
+    urlpatterns = [
         url(r'^secret$', 'my.views.secret_page', name='secret'),
         '...',
-    )
+    ]
 
 You should have an :term:`Application` registered at this point, if you don't, follow the steps in
 the previous tutorials to create one. Obtain an :term:`Access Token`, either following the OAuth2

oauth2_provider/tests/test_rest_framework.py

@@ -1,7 +1,7 @@
 import unittest
 from datetime import timedelta
 
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 from django.contrib.auth import get_user_model
 from django.http import HttpResponse
 from django.test import TestCase
@@ -50,15 +50,14 @@ class ResourceScopedView(OAuth2View):
         permission_classes = [permissions.IsAuthenticated, TokenHasResourceScope]
         required_scopes = ['resource1']
 
-    urlpatterns = patterns(
-        '',
+    urlpatterns = [
         url(r'^oauth2/', include('oauth2_provider.urls')),
         url(r'^oauth2-test/$', OAuth2View.as_view()),
         url(r'^oauth2-scoped-test/$', ScopedView.as_view()),
         url(r'^oauth2-read-write-test/$', ReadWriteScopedView.as_view()),
         url(r'^oauth2-resource-scoped-test/$', ResourceScopedView.as_view()),
         url(r'^oauth2-authenticated-or-scoped-test/$', AuthenticatedOrScopedView.as_view()),
-    )
+    ]
 
     rest_framework_installed = True
 except ImportError:

oauth2_provider/tests/urls.py

@@ -4,7 +4,7 @@
 admin.autodiscover()
 
 
-urlpatterns = (
+urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
     url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
-)
+]

oauth2_provider/urls.py

@@ -3,23 +3,23 @@
 
 from . import views
 
-urlpatterns = (
+urlpatterns = [
     url(r'^authorize/$', views.AuthorizationView.as_view(), name="authorize"),
     url(r'^token/$', views.TokenView.as_view(), name="token"),
     url(r'^revoke_token/$', views.RevokeTokenView.as_view(), name="revoke-token"),
-)
+]
 
 # Application management views
-urlpatterns += (
+urlpatterns += [
     url(r'^applications/$', views.ApplicationList.as_view(), name="list"),
     url(r'^applications/register/$', views.ApplicationRegistration.as_view(), name="register"),
     url(r'^applications/(?P<pk>\d+)/$', views.ApplicationDetail.as_view(), name="detail"),
     url(r'^applications/(?P<pk>\d+)/delete/$', views.ApplicationDelete.as_view(), name="delete"),
     url(r'^applications/(?P<pk>\d+)/update/$', views.ApplicationUpdate.as_view(), name="update"),
-)
+]
 
-urlpatterns += (
+urlpatterns += [
     url(r'^authorized_tokens/$', views.AuthorizedTokensListView.as_view(), name="authorized-token-list"),
     url(r'^authorized_tokens/(?P<pk>\d+)/delete/$', views.AuthorizedTokenDeleteView.as_view(),
         name="authorized-token-delete"),
-)
+]