diff options
| -rw-r--r-- | gitadmin/gitadmin/adm/urls.py | 20 | ||||
| -rw-r--r-- | gitadmin/gitadmin/auth.py | 4 | ||||
| -rw-r--r-- | gitadmin/gitadmin/urls.py | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/gitadmin/gitadmin/adm/urls.py b/gitadmin/gitadmin/adm/urls.py index e24f5a9..41186af 100644 --- a/gitadmin/gitadmin/adm/urls.py +++ b/gitadmin/gitadmin/adm/urls.py @@ -1,18 +1,18 @@ -from django.conf.urls import url +from django.urls import re_path import gitadmin.adm.views import gitadmin.auth urlpatterns = [ - url(r'^$', gitadmin.adm.views.index), - url(r'^repo/(\d+)/$', gitadmin.adm.views.editrepo), - url(r'^repo/(\d+)/delete/$', gitadmin.adm.views.deleterepo), - url(r'^new/$', gitadmin.adm.views.newrepo), - url(r'^help/$', gitadmin.adm.views.help), + re_path(r'^$', gitadmin.adm.views.index), + re_path(r'^repo/(\d+)/$', gitadmin.adm.views.editrepo), + re_path(r'^repo/(\d+)/delete/$', gitadmin.adm.views.deleterepo), + re_path(r'^new/$', gitadmin.adm.views.newrepo), + re_path(r'^help/$', gitadmin.adm.views.help), # Log in/out - url(r'^login/$', gitadmin.auth.login), - url(r'^logout/$', gitadmin.auth.logout), - url(r'^auth_receive/$', gitadmin.auth.auth_receive), - url(r'^auth_api/$', gitadmin.auth.auth_api), + re_path(r'^login/$', gitadmin.auth.login), + re_path(r'^logout/$', gitadmin.auth.logout), + re_path(r'^auth_receive/$', gitadmin.auth.auth_receive), + re_path(r'^auth_api/$', gitadmin.auth.auth_api), ] diff --git a/gitadmin/gitadmin/auth.py b/gitadmin/gitadmin/auth.py index 0a07571..9343fc0 100644 --- a/gitadmin/gitadmin/auth.py +++ b/gitadmin/gitadmin/auth.py @@ -47,12 +47,12 @@ import time # This signal fires when a user is created based on data from upstream. -auth_user_created_from_upstream = Signal(providing_args=['user', ]) +auth_user_created_from_upstream = Signal() # This signal fires whenever new user data has been received. Note that this # happens *after* first_name, last_name and email has been updated on the user # record, so those are not included in the userdata struct. -auth_user_data_received = Signal(providing_args=['user', 'userdata']) +auth_user_data_received = Signal() class AuthBackend(ModelBackend): diff --git a/gitadmin/gitadmin/urls.py b/gitadmin/gitadmin/urls.py index d3da655..937d507 100644 --- a/gitadmin/gitadmin/urls.py +++ b/gitadmin/gitadmin/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, re_path # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -14,10 +14,10 @@ feeds = { urlpatterns = [ # Uncomment the next line to enable the admin: - url(r'^adm/admin/', admin.site.urls), + re_path(r'^adm/admin/', admin.site.urls), # Feeds - url(r'^feeds/all/$', AllReposFeed()), + re_path(r'^feeds/all/$', AllReposFeed()), - url(r'adm/', include('gitadmin.adm.urls')), + re_path(r'adm/', include('gitadmin.adm.urls')), ] |