upgrade oauth to support django 4+

README.md

@@ -15,10 +15,18 @@ 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'))
+```
+
 Step 3: Include oauthadmin in your INSTALLED_APPS:
 
 ```python
@@ -85,6 +93,7 @@ When the CSRF validation token doesn't match, django-admin-oauth2 will redirect
 
 
 ## Changelog
+ * 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

oauthadmin/urls.py

@@ -1,9 +1,14 @@
-from django.conf.urls import url
 import oauthadmin.views
 
+try:
+    from django.urls import re_path as url
+except ImportError:
+    from django.conf.urls import url
+
+
 urlpatterns = [
-    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),
+    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),
 ]

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='django-admin-oauth2',
-    version='1.2.0',
+    version='1.2.1',
     description='A django app that replaces the django admin authentication mechanism by deferring to an oauth2 provider',
     long_description=README,
     url='https://github.com/RealGeeks/django-admin-oauth2',