Updates for django 4.2

diff --git a/hamnadmin/hamnadmin/auth.py b/hamnadmin/hamnadmin/auth.py
index 0a075715838f347669fba0c74e3e73d043ac0ade..9343fc0fa99e8472aef966f63c5404b71cf27fc8 100644 (file)
--- a/hamnadmin/hamnadmin/auth.py
+++ b/hamnadmin/hamnadmin/auth.py
@@ -47,12 +47,12 @@ import time
 
 
 # This signal fires when a user is created based on data from upstream.
 
 
 # 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.
 
 # 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):
 
 
 class AuthBackend(ModelBackend):

diff --git a/hamnadmin/hamnadmin/register/urls.py b/hamnadmin/hamnadmin/register/urls.py
index beccbf05e938037a62362809646f0604e5dd173c..2897eb3e7884930057b7e51347cbf35abb2b3145 100644 (file)
--- a/hamnadmin/hamnadmin/register/urls.py
+++ b/hamnadmin/hamnadmin/register/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url, include
+from django.urls import re_path

 
 import hamnadmin.register.views
 import hamnadmin.auth
 
 import hamnadmin.register.views
 import hamnadmin.auth


@@ -8,24 +8,24 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = [
 admin.autodiscover()
 
 urlpatterns = [

-    url(r'^$', hamnadmin.register.views.root),
-    url(r'^new/$', hamnadmin.register.views.edit),
-    url(r'^edit/(?P<id>\d+)/$', hamnadmin.register.views.edit),
-    url(r'^delete/(?P<id>\d+)/$', hamnadmin.register.views.delete),
-    url(r'^archive/(?P<id>\d+)/$', hamnadmin.register.views.archive),
-    url(r'^teamremove/(?P<teamid>\d+)/(?P<blogid>\d+)/$', hamnadmin.register.views.remove_from_team),
+    re_path(r'^$', hamnadmin.register.views.root),
+    re_path(r'^new/$', hamnadmin.register.views.edit),
+    re_path(r'^edit/(?P<id>\d+)/$', hamnadmin.register.views.edit),
+    re_path(r'^delete/(?P<id>\d+)/$', hamnadmin.register.views.delete),
+    re_path(r'^archive/(?P<id>\d+)/$', hamnadmin.register.views.archive),
+    re_path(r'^teamremove/(?P<teamid>\d+)/(?P<blogid>\d+)/$', hamnadmin.register.views.remove_from_team),

 
 

-    url(r'^blogposts/(\d+)/hide/(\d+)/$', hamnadmin.register.views.blogpost_hide),
-    url(r'^blogposts/(\d+)/unhide/(\d+)/$', hamnadmin.register.views.blogpost_unhide),
-    url(r'^blogposts/(\d+)/delete/(\d+)/$', hamnadmin.register.views.blogpost_delete),
+    re_path(r'^blogposts/(\d+)/hide/(\d+)/$', hamnadmin.register.views.blogpost_hide),
+    re_path(r'^blogposts/(\d+)/unhide/(\d+)/$', hamnadmin.register.views.blogpost_unhide),
+    re_path(r'^blogposts/(\d+)/delete/(\d+)/$', hamnadmin.register.views.blogpost_delete),

 
 

-    url(r'^moderate/$', hamnadmin.register.views.moderate),
-    url(r'^moderate/reject/(\d+)/$', hamnadmin.register.views.moderate_reject),
-    url(r'^moderate/approve/(\d+)/$', hamnadmin.register.views.moderate_approve),
-    url(r'^login/$', hamnadmin.auth.login),
-    url(r'^auth_receive/$', hamnadmin.auth.auth_receive),
-    url(r'^auth_api/$', hamnadmin.auth.auth_api),
-    url(r'^logout/$', hamnadmin.auth.logout),
+    re_path(r'^moderate/$', hamnadmin.register.views.moderate),
+    re_path(r'^moderate/reject/(\d+)/$', hamnadmin.register.views.moderate_reject),
+    re_path(r'^moderate/approve/(\d+)/$', hamnadmin.register.views.moderate_approve),
+    re_path(r'^login/$', hamnadmin.auth.login),
+    re_path(r'^auth_receive/$', hamnadmin.auth.auth_receive),
+    re_path(r'^auth_api/$', hamnadmin.auth.auth_api),
+    re_path(r'^logout/$', hamnadmin.auth.logout),

 
 

-    url(r'^admin/', admin.site.urls),
+    re_path(r'^admin/', admin.site.urls),

 ]
 ]

diff --git a/hamnadmin/hamnadmin/urls.py b/hamnadmin/hamnadmin/urls.py
index 4a0bc2dd9fa1615fb815ca56785e284d3d274ea5..03cecc24c339e2fde305567f0724a096fa36e2fb 100644 (file)
--- a/hamnadmin/hamnadmin/urls.py
+++ b/hamnadmin/hamnadmin/urls.py
@@ -1,13 +1,13 @@
-from django.conf.urls import url, include
+from django.urls import re_path, include

 
 import hamnadmin.register.views
 from hamnadmin.register.feeds import PostFeed
 
 urlpatterns = [
 
 import hamnadmin.register.views
 from hamnadmin.register.feeds import PostFeed
 
 urlpatterns = [

-    url(r'^$', hamnadmin.register.views.planet_home),
-    url(r'^add.html$', hamnadmin.register.views.planet_add),
-    url(r'^feeds.html$', hamnadmin.register.views.planet_feeds),
+    re_path(r'^$', hamnadmin.register.views.planet_home),
+    re_path(r'^add.html$', hamnadmin.register.views.planet_add),
+    re_path(r'^feeds.html$', hamnadmin.register.views.planet_feeds),

 
 

-    url(r'^rss20(?P<type>_short)?\.xml$', PostFeed()),
-    url(r'^register/', include('hamnadmin.register.urls')),
+    re_path(r'^rss20(?P<type>_short)?\.xml$', PostFeed()),
+    re_path(r'^register/', include('hamnadmin.register.urls')),

 ]
 ]