diff --git a/README.md b/README.md index 4994e7a..5dc68af 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,14 @@ Step 1: `pip install django-admin-oauth2` and include it in your project's requi Step 2: Include the django-admin-oauth2 urlconf in your project's urls.py: +Django 1.x + +```python +url(r'/admin/oauth/', include('oauthadmin.urls')) +``` + +Django >= 2.0 + ```python re_path(r'/admin/oauth/', include('oauthadmin.urls')) ``` @@ -85,7 +93,7 @@ When the CSRF validation token doesn't match, django-admin-oauth2 will redirect ## Changelog - * 1.2.1: Add support for django 4 + * 1.2.1: Add support for django 4, retain backwards compat with Django 1.x * 1.2.0: Allow overriding oauth scope with new parameter, OAUTHADMIN_SCOP * 1.1.3: Bugfix in adminsite (tabs vs spaces) * 1.1.2: Add support for django 2 diff --git a/oauthadmin/urls.py b/oauthadmin/urls.py index c750e15..aba5513 100644 --- a/oauthadmin/urls.py +++ b/oauthadmin/urls.py @@ -1,9 +1,14 @@ -from django.urls import re_path import oauthadmin.views +try: + from django.urls import re_path as url +except ImportError: + from django.conf.urls import url + + urlpatterns = [ - re_path(r'login/', oauthadmin.views.login), - re_path(r'callback/', oauthadmin.views.callback), - re_path(r'logout/', oauthadmin.views.logout), - re_path(r'logout_redirect/', oauthadmin.views.logout_redirect), + url(r"login/", oauthadmin.views.login), + url(r"callback/", oauthadmin.views.callback), + url(r"logout/", oauthadmin.views.logout), + url(r"logout_redirect/", oauthadmin.views.logout_redirect), ]