Remove Django<2 legacy calls

shop/admin/customer.py

@@ -5,7 +5,7 @@
 from django.contrib import admin
 from django.utils.encoding import force_str
 from django.utils.timezone import localtime
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import pgettext_lazy, gettext_lazy as _
 
 from shop.models.customer import CustomerModel, CustomerState
 

shop/admin/defaults/commodity.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from adminsortable2.admin import SortableAdminMixin
 from cms.admin.placeholderadmin import PlaceholderAdminMixin, FrontendEditableAdminMixin
 from shop.admin.product import CMSPageAsCategoryMixin, UnitPriceMixin, CMSPageFilter

shop/admin/defaults/customer.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.utils.html import format_html_join
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop.admin.customer import CustomerProxy, CustomerInlineAdminBase, CustomerAdminBase
 
 

shop/admin/delivery.py

@@ -7,7 +7,7 @@
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop.conf import app_settings
 from shop.admin.order import OrderItemInline
 from shop.models.order import OrderItemModel

shop/admin/notification.py

@@ -3,7 +3,7 @@
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.forms import fields, models, widgets
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_fsm import RETURN_VALUE
 

shop/admin/product.py

@@ -2,7 +2,7 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.contrib import admin
 from django.contrib.sites.models import Site
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 try:
     from django_elasticsearch_dsl.registries import registry as elasticsearch_registry

shop/apps.py

@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig
 from django.core.cache import cache
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ShopConfig(AppConfig):

shop/cascade/auth.py

@@ -1,6 +1,6 @@
 from django.template.loader import select_template
 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.utils.module_loading import import_string
 from entangled.forms import EntangledModelFormMixin
 from cms.plugin_pool import plugin_pool

shop/cascade/breadcrumb.py

@@ -3,7 +3,7 @@
 from django.template import engines, TemplateDoesNotExist
 from django.template.loader import select_template
 from django.utils.html import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from entangled.forms import EntangledModelFormMixin
 from cms.apphook_pool import apphook_pool
 from cms.plugin_pool import plugin_pool

shop/cascade/cart.py

@@ -1,7 +1,7 @@
 from django.forms import fields, widgets
 from django.template import engines, TemplateDoesNotExist
 from django.template.loader import select_template, get_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.html import mark_safe
 from entangled.forms import EntangledModelFormMixin
 from cms.plugin_pool import plugin_pool

shop/cascade/catalog.py

@@ -1,7 +1,7 @@
 from django.contrib.admin import StackedInline
 from django.forms import fields, widgets
 from django.template.loader import select_template
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext
 
 from entangled.forms import EntangledModelFormMixin, EntangledModelForm
 
@@ -64,8 +64,8 @@ def render(self, context, instance, placeholder):
     def get_identifier(cls, obj):
         pagination = obj.glossary.get('pagination')
         if pagination == 'paginator':
-            return ugettext("Manual Pagination")
-        return ugettext("Infinite Scroll")
+            return gettext("Manual Pagination")
+        return gettext("Infinite Scroll")
 
 plugin_pool.register_plugin(ShopCatalogPlugin)
 

shop/cascade/checkout.py

@@ -5,7 +5,7 @@
 from django.utils.html import format_html
 from django.utils.module_loading import import_string
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from cms.plugin_pool import plugin_pool
 from djangocms_text_ckeditor.cms_plugins import TextPlugin
 from cmsplugin_cascade.bootstrap4.buttons import ButtonFormMixin

shop/cascade/extensions.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from cms.plugin_pool import plugin_pool
 from cmsplugin_cascade.plugin_base import TransparentContainer
 from shop.cascade.plugin_base import ShopPluginBase

shop/cascade/order.py

@@ -2,7 +2,7 @@
 from django.core.exceptions import ValidationError
 from django.template import engines
 from django.template.loader import select_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from entangled.forms import EntangledModelFormMixin
 from cms.plugin_pool import plugin_pool
 from cmsplugin_cascade.bootstrap4.buttons import BootstrapButtonMixin, ButtonFormMixin

shop/cascade/plugin_base.py

@@ -6,7 +6,7 @@
 from django.template.loader import select_template
 from django.utils.html import format_html
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from entangled.forms import EntangledModelFormMixin, get_related_object
 
 if 'cmsplugin_cascade' not in settings.INSTALLED_APPS:

shop/cascade/processbar.py

@@ -1,5 +1,5 @@
 from django.forms import fields, widgets
-from django.utils.translation import ungettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.text import Truncator
 from django.utils.html import format_html
 from django.forms.fields import IntegerField

shop/cascade/search.py

@@ -2,7 +2,7 @@
 from django.forms import fields, widgets
 from django.template import engines
 from django.template.loader import select_template
-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext
 from entangled.forms import EntangledModelFormMixin
 from cms.plugin_pool import plugin_pool
 from shop.cascade.plugin_base import ShopPluginBase
@@ -61,7 +61,7 @@ def render(self, context, instance, placeholder):
     def get_identifier(cls, obj):
         pagination = obj.glossary.get('pagination')
         if pagination == 'paginator':
-            return ugettext("Manual Pagination")
-        return ugettext("Infinite Scroll")
+            return gettext("Manual Pagination")
+        return gettext("Infinite Scroll")
 
 plugin_pool.register_plugin(ShopSearchResultsPlugin)

shop/cascade/settings.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from cmsplugin_cascade.bootstrap4.mixins import BootstrapUtilities
 
 

shop/cms_apphooks.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.app_base import CMSApp
 

shop/cms_menus.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _, override
+from django.utils.translation import gettext_lazy as _, override
 
 from cms.menu_bases import CMSAttachMenu
 from menus.base import NavigationNode

shop/forms/auth.py

@@ -7,7 +7,7 @@
 from django.forms import widgets, ModelForm
 from django.template.loader import get_template, select_template, render_to_string
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from djng.forms import fields, NgModelFormMixin, NgFormValidationMixin
 from djng.styling.bootstrap3.forms import Bootstrap3ModelForm
 from post_office import mail as post_office_mail

shop/forms/base.py

@@ -6,7 +6,7 @@
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.utils.helpers import classproperty
 

shop/forms/checkout.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.forms import widgets, Media
 from django.forms.utils import ErrorDict
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from djng.forms import fields
 from sass_processor.processor import sass_processor
 from shop.forms.base import DialogForm, DialogModelForm, UniqueEmailValidationMixin

shop/forms/wizards.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.db.models import Max
 from django.forms import models, fields, widgets
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from cms.wizards.forms import BaseFormMixin
 from djangocms_text_ckeditor.fields import HTMLFormField
 from shop.models.related import ProductPageModel

shop/messages.py

@@ -4,14 +4,14 @@
 
 import json
 from django.contrib import messages as django_messages
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 
 def add_message(request, level, message, title=None, delay=None):
     if title is None:
         title = django_messages.DEFAULT_TAGS[level].capitalize()
-    extra_tags = {'title': force_text(title), 'delay': delay}
-    django_messages.add_message(request, level, force_text(message), extra_tags=json.dumps(extra_tags))
+    extra_tags = {'title': force_str(title), 'delay': delay}
+    django_messages.add_message(request, level, force_str(message), extra_tags=json.dumps(extra_tags))
 
 
 def success(request, message, title=None, delay=0):

shop/models/address.py

@@ -3,7 +3,7 @@
 """
 from django.db import models
 from django.template.loader import select_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from shop import deferred
 from shop.conf import app_settings

shop/models/cart.py

@@ -3,7 +3,7 @@
 
 from django.core import checks
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from shop import deferred
 from shop.models.fields import JSONField

shop/models/customer.py

@@ -12,7 +12,7 @@
 from django.dispatch import receiver
 from django.utils import timezone
 from django.utils.functional import SimpleLazyObject
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from shop import deferred
 from shop.models.fields import JSONField

shop/models/defaults/address.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 shop.models.address import BaseShippingAddress, BaseBillingAddress, CountryField
 

shop/models/defaults/commodity.py

@@ -6,7 +6,7 @@
 from django.conf import settings
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from cms.models.fields import PlaceholderField
 from filer.fields import image
 from djangocms_text_ckeditor.fields import HTMLField

shop/models/defaults/customer.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.template.loader import select_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop.conf import app_settings
 from shop.models.customer import BaseCustomer
 

shop/models/defaults/delivery.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop.models.delivery import BaseDelivery
 
 

shop/models/defaults/delivery_item.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 shop.models.delivery import BaseDeliveryItem
 
 

shop/models/defaults/order.py

@@ -4,7 +4,7 @@
 
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from shop.models import order
 
 

shop/models/defaults/order_item.py

@@ -1,5 +1,5 @@
 from django.db.models import PositiveIntegerField
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from shop.models import order
 
 

shop/models/delivery.py

@@ -1,6 +1,6 @@
 from django.core import checks
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from shop import deferred
 from shop.models.order import BaseOrder, BaseOrderItem, OrderItemModel

shop/models/fields.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.db import models
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 postgresql_engine_names = [

shop/models/inventory.py

@@ -2,7 +2,7 @@
 from django.db import models
 from django.db.models.aggregates import Sum
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop.conf import app_settings
 from shop.models.product import Availability, BaseReserveProductMixin
 from shop.exceptions import ProductNotAvailable

shop/models/notification.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.db import models
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from post_office.models import EmailTemplate
 from filer.fields.file import FilerFileField
 from shop.conf import app_settings

shop/models/order.py

@@ -8,7 +8,7 @@
 from django.db.models.aggregates import Sum
 from django.urls import NoReverseMatch, reverse
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy, get_language_from_request
+from django.utils.translation import gettext_lazy as _, pgettext_lazy, get_language_from_request
 
 from django_fsm import FSMField, transition
 from ipware.ip import get_ip

shop/models/product.py

@@ -10,7 +10,7 @@
 from django.db.models.functions import Coalesce
 from django.utils import timezone
 from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 try:
     from django_elasticsearch_dsl.registries import registry as elasticsearch_registry

shop/models/related.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 import image
 

shop/modifiers/defaults.py

@@ -1,5 +1,5 @@
 from decimal import Decimal
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shop import messages
 from shop.exceptions import ProductNotAvailable
 from shop.money import AbstractMoney, Money

shop/modifiers/taxes.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from shop.conf import app_settings
 from shop.serializers.cart import ExtraCartRow