Skip to content

Commit b1beded

Browse files
committed
Fix admin.site.urls inclusion on Django>=1.9
1 parent 6b7c0b2 commit b1beded

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

docs/rest-framework/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Here's our project's root `urls.py` module:
9494
urlpatterns = [
9595
url(r'^', include(router.urls)),
9696
url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
97-
url(r'^admin/', include(admin.site.urls)),
97+
# ...
9898
]
9999
100100
Also add the following to your `settings.py` module:

docs/tutorial/tutorial_01.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Include the Django OAuth Toolkit urls in your `urls.py`, choosing the urlspace y
3434
.. code-block:: python
3535
3636
urlpatterns = [
37-
url(r'^admin/', include(admin.site.urls)),
37+
url(r"^admin/", admin.site.urls)),
3838
url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
3939
# ...
4040
]

docs/tutorial/tutorial_02.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ URL this view will respond to:
6666
urlpatterns = [
6767
# OAuth 2 endpoints:
6868
url(r'^o/', include(oauth2_endpoint_views, namespace="oauth2_provider")),
69-
70-
url(r'^admin/', include(admin.site.urls)),
7169
url(r'^api/hello', ApiEndpoint.as_view()), # an example resource endpoint
7270
]
7371

oauth2_provider/tests/urls.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
import django
12
from django.conf.urls import include, url
23
from django.contrib import admin
34

45
admin.autodiscover()
56

67

78
urlpatterns = [
8-
url(r'^admin/', include(admin.site.urls)),
99
url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
1010
]
11+
12+
13+
if django.VERSION < (1, 9, 0):
14+
urlpatterns += [url(r"^admin/", include(admin.site.urls))]
15+
else:
16+
urlpatterns += [url(r"^admin/", admin.site.urls)]

0 commit comments

Comments
 (0)