Define urls such that they are namespaced properly and forward-compatible with newer Django standards

Author: poswald

docs/tutorial/tutorial_02.rst

@@ -35,33 +35,41 @@ URL this view will respond to:
 .. code-block:: python
 
     from django.conf.urls import patterns, url
-    from oauth2_provider import views
+    import oauth2_provider.views as oauth2_views
     from django.conf import settings
     from .views import ApiEndpoint
 
-    urlpatterns = patterns(
-        '',
-        url(r'^admin/', include(admin.site.urls)),
-
-        # OAuth2 provider endpoints
-        url(r'^o/authorize/$', views.AuthorizationView.as_view(), name="authorize"),
-        url(r'^o/token/$', views.TokenView.as_view(), name="token"),
-        url(r'^o/revoke-token/$', views.RevokeTokenView.as_view(), name="revoke-token"),
-
-        url(r'^api/hello', ApiEndpoint.as_view()),  # a resource endpoint
-    )
+    # OAuth2 provider endpoints
+    oauth2_endpoint_views = [
+        url(r'^authorize/$', oauth2_views.AuthorizationView.as_view(), name="authorize"),
+        url(r'^token/$', oauth2_views.TokenView.as_view(), name="token"),
+        url(r'^revoke-token/$', oauth2_views.RevokeTokenView.as_view(), name="revoke-token"),
+    ]
 
     if settings.DEBUG:
-        # OAuth2 Application management views
-
-        urlpatterns += patterns(
-            '',
-            url(r'^o/applications/$', views.ApplicationList.as_view(), name="application-list"),
-            url(r'^o/applications/register/$', views.ApplicationRegistration.as_view(), name="application-register"),
-            url(r'^o/applications/(?P<pk>\d+)/$', views.ApplicationDetail.as_view(), name="application-detail"),
-            url(r'^o/applications/(?P<pk>\d+)/delete/$', views.ApplicationDelete.as_view(), name="application-delete"),
-            url(r'^o/applications/(?P<pk>\d+)/update/$', views.ApplicationUpdate.as_view(), name="application-update"),
-        )
+        # OAuth2 Application Management endpoints
+        oauth2_endpoint_views += [
+            url(r'^applications/$', oauth2_views.ApplicationList.as_view(), name="list"),
+            url(r'^applications/register/$', oauth2_views.ApplicationRegistration.as_view(), name="register"),
+            url(r'^applications/(?P<pk>\d+)/$', oauth2_views.ApplicationDetail.as_view(), name="detail"),
+            url(r'^applications/(?P<pk>\d+)/delete/$', oauth2_views.ApplicationDelete.as_view(), name="delete"),
+            url(r'^applications/(?P<pk>\d+)/update/$', oauth2_views.ApplicationUpdate.as_view(), name="update"),
+        ]
+
+        # OAuth2 Token Management endpoints
+        oauth2_endpoint_views += [
+            url(r'^authorized-tokens/$', oauth2_views.AuthorizedTokensListView.as_view(), name="authorized-token-list"),
+            url(r'^authorized-tokens/(?P<pk>\d+)/delete/$', oauth2_views.AuthorizedTokenDeleteView.as_view(),
+                name="authorized-token-delete"),
+        ]
+
+    urlpatterns = [
+        # OAuth 2 endpoints:
+        url(r'^o/', include(oauth2_endpoint_views, namespace="oauth2_provider")),
+
+        url(r'^admin/', include(admin.site.urls)),
+        url(r'^api/hello', ApiEndpoint.as_view()),  # an example resource endpoint
+    ]
 
 You will probably want to write your own application views to deal with permissions and access control but the ones packaged with the library can get you started when developing the app.