[#939] Refactor function names

src/open_inwoner/accounts/admin.py

@@ -6,7 +6,7 @@
 from django.http.request import HttpRequest
 from django.urls import reverse, reverse_lazy
 from django.utils.html import format_html, format_html_join
-from django.utils.translation import ngettext, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, ngettext
 
 from image_cropping import ImageCroppingMixin
 from privates.admin import PrivateMediaMixin

src/open_inwoner/accounts/forms.py

@@ -7,7 +7,7 @@
 from django.core.exceptions import ValidationError
 from django.core.mail import EmailMultiAlternatives
 from django.template import loader
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_registration.forms import RegistrationForm
 

src/open_inwoner/accounts/models.py

@@ -11,7 +11,7 @@
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.crypto import get_random_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from image_cropping import ImageCropField, ImageRatioField
 from localflavor.nl.models import NLBSNField, NLZipCodeField

src/open_inwoner/accounts/tests/test_contact_views.py

@@ -5,7 +5,7 @@
 from django.core.files.images import ImageFile
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms import api
 from django_webtest import WebTest

src/open_inwoner/accounts/tests/test_file_upload.py

@@ -2,7 +2,7 @@
 from django.template.defaultfilters import filesizeformat
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from privates.test import temp_private_root

src/open_inwoner/accounts/tests/test_inbox_page.py

@@ -2,7 +2,7 @@
 
 from django.test import override_settings, tag
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from playwright.sync_api import expect

src/open_inwoner/accounts/tests/test_inbox_start_page.py

@@ -1,6 +1,6 @@
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from furl import furl

src/open_inwoner/accounts/tests/test_logging.py

@@ -7,7 +7,7 @@
 from django.test import override_settings
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from freezegun import freeze_time

src/open_inwoner/accounts/tests/test_profile_views.py

@@ -6,7 +6,7 @@
 from django.template.defaultfilters import date as django_date
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import requests_mock
 from cms import api

src/open_inwoner/accounts/views/login.py

@@ -8,7 +8,7 @@
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.decorators import method_decorator
-from django.utils.http import is_safe_url
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.translation import gettext as _
 from django.views.decorators.cache import never_cache
 from django.views.generic import FormView, View
@@ -148,7 +148,7 @@ def get_success_url(self):
         )
 
         # Ensure the user-originating redirection url is safe.
-        if not redirect_to or not is_safe_url(
+        if not redirect_to or not url_has_allowed_host_and_scheme(
             url=redirect_to,
             allowed_hosts=[
                 self.request.get_host(),

src/open_inwoner/api/search/serializers.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
 

src/open_inwoner/cms/banner/models.py

@@ -1,7 +1,7 @@
 import os
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.models import CMSPlugin
 from filer.fields.image import FilerImageField

src/open_inwoner/cms/collaborate/cms_plugins.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool

src/open_inwoner/cms/plugins/models/userfeed.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.models import CMSPlugin
 

src/open_inwoner/cms/products/cms_plugins.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool

src/open_inwoner/cms/profile/cms_toolbars.py

@@ -1,5 +1,5 @@
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from aldryn_apphooks_config.utils import get_app_instance
 from cms.extensions.toolbar import ExtensionToolbar

src/open_inwoner/conf/base.py

@@ -1,7 +1,7 @@
 import os
 
 from django.urls import reverse_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import sentry_sdk
 from log_outgoing_requests.formatters import HttpFormatter

src/open_inwoner/configurations/admin.py

@@ -14,7 +14,7 @@
 from django.urls import resolve, reverse
 from django.urls.exceptions import Resolver404
 from django.utils.html import format_html, format_html_join
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ordered_model.admin import OrderedInlineModelAdminMixin, OrderedTabularInline
 from solo.admin import SingletonModelAdmin

src/open_inwoner/configurations/choices.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ColorTypeChoices(models.TextChoices):

src/open_inwoner/configurations/models.py

@@ -3,7 +3,7 @@
 from django.contrib.flatpages.models import FlatPage
 from django.core.validators import FileExtensionValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from colorfield.fields import ColorField
 from django_better_admin_arrayfield.models.fields import ArrayField

src/open_inwoner/configurations/tests/test_admin.py

@@ -1,6 +1,6 @@
 from django.contrib.sites.models import Site
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from maykin_2fa.test import disable_admin_mfa

src/open_inwoner/configurations/tests/test_help_modal.py

@@ -1,6 +1,6 @@
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 

src/open_inwoner/haalcentraal/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class HaalCentraalConfig(AppConfig):

src/open_inwoner/kvk/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class KvKConfig(AppConfig):

src/open_inwoner/media/choices.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class VideoPlayerChoices(models.TextChoices):

src/open_inwoner/media/models/video.py

@@ -3,7 +3,7 @@
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from open_inwoner.media.choices import VideoPlayerChoices
 from open_inwoner.utils.text import middle_truncate

src/open_inwoner/openzaak/resources/import_resource.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from import_export import fields, resources
 from import_export.exceptions import ImportExportError

src/open_inwoner/pdc/admin/organization.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Organization, OrganizationType
 from .mixins import GeoAdminMixin

src/open_inwoner/pdc/models/category.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_better_admin_arrayfield.models.fields import ArrayField
 from filer.fields.image import FilerImageField

src/open_inwoner/pdc/models/faq.py

@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import CheckConstraint, Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ordered_model.models import OrderedModel
 

src/open_inwoner/pdc/models/mixins.py

@@ -5,7 +5,7 @@
 from django.contrib.gis.db.models import PointField
 from django.core.exceptions import ValidationError
 from django.db import connection, models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from geopy.exc import GeopyError
 from localflavor.nl.models import NLZipCodeField

src/open_inwoner/pdc/models/neighbourhood.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class Neighbourhood(models.Model):

src/open_inwoner/pdc/models/organization.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from filer.fields.image import FilerImageField
 

src/open_inwoner/pdc/models/product.py

@@ -5,7 +5,8 @@
 from django.contrib.postgres.fields import ArrayField
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.html import strip_tags
+from django.utils.translation import gettext_lazy as _
 
 from filer.fields.file import FilerFileField
 from filer.fields.image import FilerImageField

src/open_inwoner/pdc/models/tag.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from filer.fields.image import FilerImageField
 

src/open_inwoner/pdc/resources/import_resource.py

@@ -1,5 +1,5 @@
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from import_export import fields, resources
 from import_export.exceptions import ImportExportError

src/open_inwoner/pdc/resources/widgets.py

@@ -1,5 +1,5 @@
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from import_export.widgets import ManyToManyWidget
 

src/open_inwoner/pdc/tests/test_organization_location.py

@@ -1,7 +1,7 @@
 from unittest.mock import patch
 
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from maykin_2fa.test import disable_admin_mfa

src/open_inwoner/pdc/tests/test_product_location.py

@@ -4,7 +4,7 @@
 from django.contrib.gis.geos import Point
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from maykin_2fa.test import disable_admin_mfa

src/open_inwoner/pdc/views.py

@@ -3,7 +3,7 @@
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, FormView, ListView, TemplateView
 
 from view_breadcrumbs import BaseBreadcrumbMixin, ListBreadcrumbMixin

src/open_inwoner/plans/models.py

@@ -5,7 +5,7 @@
 from django.db.models import Q
 from django.template.loader import render_to_string
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from filer.fields.file import FilerFileField
 

src/open_inwoner/plans/tests/test_logging.py

@@ -1,7 +1,7 @@
 from django.contrib.admin.models import ADDITION, CHANGE
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from freezegun import freeze_time

src/open_inwoner/search/admin.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib import admin, messages
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin
 from import_export.admin import ImportExportMixin

src/open_inwoner/search/constants.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FacetChoices(models.TextChoices):

src/open_inwoner/search/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.forms import widgets
 from django.forms.widgets import Textarea
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from open_inwoner.components.templatetags.form_tags import form
 

src/open_inwoner/search/models.py

@@ -1,7 +1,7 @@
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models.deletion import CASCADE
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_better_admin_arrayfield.models.fields import ArrayField
 from solo.models import SingletonModel

src/open_inwoner/search/tests/test_feedback.py

@@ -3,7 +3,7 @@
 from django.contrib import messages
 from django.test import override_settings, tag
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_webtest import WebTest
 from furl import furl

src/open_inwoner/userfeed/choices.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FeedItemType(models.TextChoices):