From 623f529a0ba717b0089188ad104bc2b7d762a8d5 Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 12:44:39 -0700 Subject: [PATCH 1/8] Django 4.0: ugettext_lazy -> gettext_lazy ugettext_lazy` was deprecated in v2.2 and no longer used in django v3 https://docs.djangoproject.com/en/4.0/releases/4.0/#features-removed-in-4-0 --- avatar/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/models.py b/avatar/models.py index 1e2ab04..07048bb 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -9,7 +9,7 @@ from django.core.files import File from django.core.files.base import ContentFile from django.core.files.storage import get_storage_class from django.utils.module_loading import import_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.encoding import force_text from django.db.models import signals From ec6f8bbf2b9b1236c86ba9a0aaa94aca941b0de6 Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 12:56:09 -0700 Subject: [PATCH 2/8] Django 4.0: force_text -> force_str https://docs.djangoproject.com/en/4.0/ref/utils/#module-django.utils.encoding --- avatar/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/avatar/models.py b/avatar/models.py index 07048bb..71bf2b2 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -10,7 +10,8 @@ from django.core.files.base import ContentFile from django.core.files.storage import get_storage_class from django.utils.module_loading import import_string from django.utils.translation import gettext_lazy as _ -from django.utils.encoding import force_text +from django.utils.encoding import force_str + from django.db.models import signals from avatar.conf import settings @@ -39,7 +40,7 @@ def avatar_path_handler(instance=None, filename=None, size=None, ext=None): if settings.AVATAR_EXPOSE_USERNAMES: tmppath.append(get_username(instance.user)) else: - tmppath.append(force_text(instance.user.pk)) + tmppath.append(force_str(instance.user.pk)) if not filename: # Filename already stored in database filename = instance.avatar.name From d941939441e622fbf67a8ad6da1da1b864503fcc Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:03:33 -0700 Subject: [PATCH 3/8] Django 4.0: ugettext_lazy -> gettext_lazy --- avatar/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/admin.py b/avatar/admin.py index a47f74b..0025f24 100644 --- a/avatar/admin.py +++ b/avatar/admin.py @@ -4,7 +4,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.loader import render_to_string from avatar.models import Avatar From 9fd68769c8bdef51f91d38438ceaa0120b58f71a Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:06:16 -0700 Subject: [PATCH 4/8] Django 4.0: Signal -> providing_args deprecated https://docs.djangoproject.com/en/4.0/releases/3.1/#id2 --- avatar/signals.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avatar/signals.py b/avatar/signals.py index 080910e..9074a91 100644 --- a/avatar/signals.py +++ b/avatar/signals.py @@ -1,5 +1,5 @@ import django.dispatch -avatar_updated = django.dispatch.Signal(providing_args=["user", "avatar"]) -avatar_deleted = django.dispatch.Signal(providing_args=["user", "avatar"]) +avatar_updated = django.dispatch.Signal() +avatar_deleted = django.dispatch.Signal() From 346530c14cd2034003b265e4309d86395eaf3153 Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:16:55 -0700 Subject: [PATCH 5/8] Django 4.0: url -> re_path https://docs.djangoproject.com/en/4.0/ref/urls/#re-path --- avatar/urls.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/avatar/urls.py b/avatar/urls.py index b031d60..379158e 100644 --- a/avatar/urls.py +++ b/avatar/urls.py @@ -1,12 +1,12 @@ -from django.conf.urls import url +from django.urls import re_path from avatar import views urlpatterns = [ - url(r'^add/$', views.add, name='avatar_add'), - url(r'^change/$', views.change, name='avatar_change'), - url(r'^delete/$', views.delete, name='avatar_delete'), - url(r'^render_primary/(?P[\w\d\@\.\-_]+)/(?P[\d]+)/$', + re_path(r'^add/$', views.add, name='avatar_add'), + re_path(r'^change/$', views.change, name='avatar_change'), + re_path(r'^delete/$', views.delete, name='avatar_delete'), + re_path(r'^render_primary/(?P[\w\d\@\.\-_]+)/(?P[\d]+)/$', views.render_primary, name='avatar_render_primary'), ] From be9187fb62fd5a7c75b4b6d349193d3bc40209ee Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:20:33 -0700 Subject: [PATCH 6/8] Update views.py --- avatar/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/views.py b/avatar/views.py index 8221b2f..b8bf605 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render, redirect -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ # Issue 182: six no longer included with Django 3.0 try: from django.utils import six From 12a6d654541b11dae15c02205eab6e9f284404f6 Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:22:00 -0700 Subject: [PATCH 7/8] Update forms.py --- avatar/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/forms.py b/avatar/forms.py index 9fa9f0b..7c0b204 100644 --- a/avatar/forms.py +++ b/avatar/forms.py @@ -9,7 +9,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import filesizeformat from avatar.conf import settings From 61f135fa71a980d2ca0922d508296dc7db56be72 Mon Sep 17 00:00:00 2001 From: rsp2k Date: Thu, 27 Jan 2022 13:33:44 -0700 Subject: [PATCH 8/8] Django 4.0: ugettext -> gettext --- avatar/templatetags/avatar_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py index b8beb75..5ca0d35 100644 --- a/avatar/templatetags/avatar_tags.py +++ b/avatar/templatetags/avatar_tags.py @@ -10,7 +10,7 @@ try: from django.utils import six except ImportError: import six -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.utils.module_loading import import_string from avatar.conf import settings