Upgrade to Django 3.0 and other dependencies (#1568)

* Upgrade Django to 3.0 and other dependencies to recent versions

* Fix otp version contsraint

* Remove six dependency

* Resolve some warnings

* Fix failing tests

* Update django-countries

* Resolve all RemovedInDjango31Warnings in test suite

* Run isort

* Fix import

* Update PostgreSQL version on travis

src/pretix/plugins/badges/__init__.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 
 from pretix import __version__ as version
 
@@ -21,7 +21,7 @@ class BadgesApp(AppConfig):
     def installed(self, event):
         if not event.badge_layouts.exists():
             event.badge_layouts.create(
-                name=ugettext('Default'),
+                name=gettext('Default'),
                 default=True,
             )
 

src/pretix/plugins/badges/exporters.py

@@ -11,7 +11,7 @@ from django.core.files import File
 from django.core.files.storage import default_storage
 from django.db.models import Exists, OuterRef
 from django.db.models.functions import Coalesce
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
 from jsonfallback.functions import JSONExtract
 from reportlab.lib import pagesizes
 from reportlab.lib.units import mm
@@ -38,7 +38,7 @@ def _renderer(event, layout):
 
 OPTIONS = OrderedDict([
     ('one', {
-        'name': ugettext_lazy('One badge per page'),
+        'name': gettext_lazy('One badge per page'),
         'cols': 1,
         'rows': 1,
         'margins': [0, 0, 0, 0],
@@ -46,7 +46,7 @@ OPTIONS = OrderedDict([
         'pagesize': None,
     }),
     ('a4_a6l', {
-        'name': ugettext_lazy('4 landscape A6 pages on one A4 page'),
+        'name': gettext_lazy('4 landscape A6 pages on one A4 page'),
         'cols': 2,
         'rows': 2,
         'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -54,7 +54,7 @@ OPTIONS = OrderedDict([
         'pagesize': pagesizes.landscape(pagesizes.A4),
     }),
     ('a4_a6p', {
-        'name': ugettext_lazy('4 portrait A6 pages on one A4 page'),
+        'name': gettext_lazy('4 portrait A6 pages on one A4 page'),
         'cols': 2,
         'rows': 2,
         'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -62,7 +62,7 @@ OPTIONS = OrderedDict([
         'pagesize': pagesizes.portrait(pagesizes.A4),
     }),
     ('a4_a7l', {
-        'name': ugettext_lazy('8 landscape A7 pages on one A4 page'),
+        'name': gettext_lazy('8 landscape A7 pages on one A4 page'),
         'cols': 2,
         'rows': 4,
         'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],
@@ -70,7 +70,7 @@ OPTIONS = OrderedDict([
         'pagesize': pagesizes.portrait(pagesizes.A4),
     }),
     ('a4_a7p', {
-        'name': ugettext_lazy('8 portrait A7 pages on one A4 page'),
+        'name': gettext_lazy('8 portrait A7 pages on one A4 page'),
         'cols': 4,
         'rows': 2,
         'margins': [0 * mm, 0 * mm, 0 * mm, 0 * mm],

src/pretix/plugins/badges/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.forms import Field
 from django.forms.models import ModelChoiceIterator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.plugins.badges.models import BadgeItem, BadgeLayout
 

src/pretix/plugins/badges/models.py

@@ -2,7 +2,7 @@ import string
 
 from django.db import models
 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 pretix.base.models import LoggedModel
 

src/pretix/plugins/badges/signals.py

@@ -6,7 +6,7 @@ from django.dispatch import receiver
 from django.template.loader import get_template
 from django.urls import resolve, reverse
 from django.utils.html import escape
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import Event, Order
 from pretix.base.signals import (

src/pretix/plugins/badges/views.py

@@ -13,7 +13,7 @@ from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.generic import CreateView, DeleteView, DetailView, ListView
 from reportlab.lib import pagesizes

src/pretix/plugins/banktransfer/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/banktransfer/payment.py

@@ -6,7 +6,7 @@ from django import forms
 from django.core.exceptions import ValidationError
 from django.http import HttpRequest
 from django.template.loader import get_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from i18nfield.fields import I18nFormField, I18nTextarea
 from i18nfield.forms import I18nTextInput
 from i18nfield.strings import LazyI18nString

src/pretix/plugins/banktransfer/signals.py

@@ -1,7 +1,7 @@
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import register_payment_providers
 from pretix.control.signals import html_head, nav_event, nav_organizer

src/pretix/plugins/banktransfer/tasks.py

@@ -6,7 +6,7 @@ from celery.exceptions import MaxRetriesExceededError
 from django.conf import settings
 from django.db import transaction
 from django.db.models import Q
-from django.utils.translation import ugettext, ugettext_noop
+from django.utils.translation import gettext, gettext_noop
 from django_scopes import scope, scopes_disabled
 
 from pretix.base.email import get_email_context
@@ -28,7 +28,7 @@ def notify_incomplete_payment(o: Order):
     with language(o.locale):
         email_template = o.event.settings.mail_text_order_expire_warning
         email_context = get_email_context(event=o.event, order=o)
-        email_subject = ugettext('Your order received an incomplete payment: %(code)s') % {'code': o.code}
+        email_subject = gettext('Your order received an incomplete payment: %(code)s') % {'code': o.code}
 
         try:
             o.send_mail(
@@ -96,7 +96,7 @@ def _handle_transaction(trans: BankTransaction, code: str, event: Event=None, or
         trans.state = BankTransaction.STATE_DUPLICATE
     elif trans.order.status == Order.STATUS_CANCELED:
         trans.state = BankTransaction.STATE_ERROR
-        trans.message = ugettext_noop('The order has already been canceled.')
+        trans.message = gettext_noop('The order has already been canceled.')
     else:
         try:
             p, created = trans.order.payments.get_or_create(

src/pretix/plugins/banktransfer/views.py

@@ -12,7 +12,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.timezone import now
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import DetailView, ListView, View
 
 from pretix.base.models import Order, OrderPayment, OrderRefund, Quota

src/pretix/plugins/checkinlists/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/checkinlists/exporters.py

@@ -10,7 +10,7 @@ from django.db.models.functions import Coalesce, NullIf
 from django.urls import reverse
 from django.utils.formats import date_format
 from django.utils.timezone import is_aware, make_aware
-from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy, pgettext
 from jsonfallback.functions import JSONExtract
 from pytz import UTC
 from reportlab.lib.units import mm
@@ -180,7 +180,7 @@ class TableTextRotate(Flowable):
 class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
     name = "overview"
     identifier = 'checkinlistpdf'
-    verbose_name = ugettext_lazy('Check-in list (PDF)')
+    verbose_name = gettext_lazy('Check-in list (PDF)')
 
     @property
     def export_form_fields(self):
@@ -312,7 +312,7 @@ class PDFCheckinList(ReportlabExportMixin, CheckInListMixin, BaseExporter):
 class CSVCheckinList(CheckInListMixin, ListExporter):
     name = "overview"
     identifier = 'checkinlist'
-    verbose_name = ugettext_lazy('Check-in list')
+    verbose_name = gettext_lazy('Check-in list')
 
     @property
     def additional_form_fields(self):

src/pretix/plugins/manualpayment/__init__.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 _
 
 from pretix import __version__ as version
 

src/pretix/plugins/paypal/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/paypal/payment.py

@@ -10,7 +10,7 @@ from django.core import signing
 from django.http import HttpRequest
 from django.template.loader import get_template
 from django.urls import reverse
-from django.utils.translation import ugettext as __, ugettext_lazy as _
+from django.utils.translation import gettext as __, gettext_lazy as _
 from i18nfield.strings import LazyI18nString
 from paypalrestsdk.exceptions import BadRequest
 from paypalrestsdk.openid_connect import Tokeninfo

src/pretix/plugins/paypal/signals.py

@@ -4,7 +4,7 @@ from collections import OrderedDict
 from django import forms
 from django.dispatch import receiver
 from django.template.loader import get_template
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import (
     logentry_display, register_global_settings, register_payment_providers,

src/pretix/plugins/paypal/views.py

@@ -9,7 +9,7 @@ from django.db.models import Sum
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST

src/pretix/plugins/pretixdroid/__init__.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 _
 
 from pretix import __version__ as version
 

src/pretix/plugins/pretixdroid/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_scopes.forms import (
     SafeModelChoiceField, SafeModelMultipleChoiceField,
 )

src/pretix/plugins/pretixdroid/models.py

@@ -2,7 +2,7 @@ import string
 
 from django.db import models
 from django.utils.crypto import get_random_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AppConfiguration(models.Model):

src/pretix/plugins/pretixdroid/signals.py

@@ -1,7 +1,7 @@
 
 from django.dispatch import receiver
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import logentry_display
 from pretix.control.logdisplay import _display_checkin

src/pretix/plugins/pretixdroid/views.py

@@ -14,7 +14,7 @@ from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, View
 from django_scopes import scope, scopes_disabled

src/pretix/plugins/reports/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/reports/exporters.py

@@ -12,7 +12,7 @@ from django.db.models import Max, OuterRef, Subquery, Sum
 from django.template.defaultfilters import floatformat
 from django.utils.formats import date_format, localize
 from django.utils.timezone import get_current_timezone, now
-from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy, pgettext
 from reportlab.lib import colors
 
 from pretix.base.decimal import round_decimal
@@ -150,7 +150,7 @@ class Report(ReportlabExportMixin, BaseExporter):
 class OverviewReport(Report):
     name = "overview"
     identifier = 'pdfreport'
-    verbose_name = ugettext_lazy('Order overview (PDF)')
+    verbose_name = gettext_lazy('Order overview (PDF)')
 
     @property
     def pagesize(self):
@@ -296,7 +296,7 @@ class OverviewReport(Report):
 class OrderTaxListReportPDF(Report):
     name = "ordertaxlist"
     identifier = 'ordertaxes'
-    verbose_name = ugettext_lazy('List of orders with taxes (PDF)')
+    verbose_name = gettext_lazy('List of orders with taxes (PDF)')
 
     @property
     def export_form_fields(self):
@@ -304,7 +304,7 @@ class OrderTaxListReportPDF(Report):
             [
                 ('status',
                  forms.MultipleChoiceField(
-                     label=ugettext_lazy('Filter by status'),
+                     label=gettext_lazy('Filter by status'),
                      initial=[Order.STATUS_PAID],
                      choices=Order.STATUS_CHOICE,
                      widget=forms.CheckboxSelectMultiple,
@@ -312,11 +312,11 @@ class OrderTaxListReportPDF(Report):
                  )),
                 ('sort',
                  forms.ChoiceField(
-                     label=ugettext_lazy('Sort by'),
+                     label=gettext_lazy('Sort by'),
                      initial='datetime',
                      choices=(
-                         ('datetime', ugettext_lazy('Order date')),
-                         ('payment_date', ugettext_lazy('Payment date')),
+                         ('datetime', gettext_lazy('Order date')),
+                         ('payment_date', gettext_lazy('Payment date')),
                      ),
                      widget=forms.RadioSelect,
                      required=False
@@ -467,7 +467,7 @@ class OrderTaxListReportPDF(Report):
 
 class OrderTaxListReport(ListExporter):
     identifier = 'ordertaxeslist'
-    verbose_name = ugettext_lazy('List of orders with taxes')
+    verbose_name = gettext_lazy('List of orders with taxes')
 
     @property
     def export_form_fields(self):
@@ -487,8 +487,8 @@ class OrderTaxListReport(ListExporter):
                      label=_('Sort by'),
                      initial='datetime',
                      choices=(
-                         ('datetime', ugettext_lazy('Order date')),
-                         ('payment_date', ugettext_lazy('Payment date')),
+                         ('datetime', gettext_lazy('Order date')),
+                         ('payment_date', gettext_lazy('Payment date')),
                      ),
                      widget=forms.RadioSelect,
                      required=False

src/pretix/plugins/returnurl/__init__.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 _
 
 from pretix import __version__ as version
 

src/pretix/plugins/returnurl/signals.py

@@ -2,7 +2,7 @@ from django.core.exceptions import PermissionDenied
 from django.dispatch import receiver
 from django.shortcuts import redirect
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.control.signals import nav_event_settings
 from pretix.presale.signals import process_request

src/pretix/plugins/returnurl/views.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.forms import SettingsForm
 from pretix.base.models import Event

src/pretix/plugins/sendmail/__init__.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 _
 
 from pretix import __version__ as version
 

src/pretix/plugins/sendmail/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.urls import reverse
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes.forms import SafeModelMultipleChoiceField
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
 

src/pretix/plugins/sendmail/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import receiver
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import logentry_display
 from pretix.control.signals import nav_event

src/pretix/plugins/sendmail/views.py

@@ -6,7 +6,7 @@ from django.db.models import Exists, OuterRef, Q
 from django.http import Http404
 from django.shortcuts import redirect
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, ListView
 
 from pretix.base.email import get_available_placeholders

src/pretix/plugins/statistics/__init__.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 _
 
 from pretix import __version__ as version
 

src/pretix/plugins/statistics/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import receiver
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import order_paid, order_placed
 from pretix.control.signals import nav_event

src/pretix/plugins/stripe/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/stripe/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.forms import SettingsForm
 

src/pretix/plugins/stripe/payment.py

@@ -17,7 +17,7 @@ from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
-from django.utils.translation import pgettext, ugettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _, pgettext
 from django_countries import countries
 
 from pretix import __version__
@@ -882,7 +882,7 @@ class StripeGiropay(StripeMethod):
                     'code': payment.order.code
                 },
                 owner={
-                    'name': request.session.get('payment_stripe_giropay_account') or ugettext('unknown name')
+                    'name': request.session.get('payment_stripe_giropay_account') or gettext('unknown name')
                 },
                 statement_descriptor=self.statement_descriptor(payment, 35),
                 redirect={
@@ -1033,7 +1033,7 @@ class StripeBancontact(StripeMethod):
                     'code': payment.order.code
                 },
                 owner={
-                    'name': request.session.get('payment_stripe_bancontact_account') or ugettext('unknown name')
+                    'name': request.session.get('payment_stripe_bancontact_account') or gettext('unknown name')
                 },
                 statement_descriptor=self.statement_descriptor(payment, 35),
                 redirect={
@@ -1166,7 +1166,7 @@ class StripeEPS(StripeMethod):
                     'code': payment.order.code
                 },
                 owner={
-                    'name': request.session.get('payment_stripe_eps_account') or ugettext('unknown name')
+                    'name': request.session.get('payment_stripe_eps_account') or gettext('unknown name')
                 },
                 statement_descriptor=self.statement_descriptor(payment),
                 redirect={

src/pretix/plugins/stripe/signals.py

@@ -5,7 +5,7 @@ from django import forms
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.urls import resolve, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.settings import settings_hierarkey
 from pretix.base.signals import (

src/pretix/plugins/stripe/views.py

@@ -12,7 +12,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 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 import View
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.decorators.csrf import csrf_exempt

src/pretix/plugins/ticketoutputpdf/__init__.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix import __version__ as version
 

src/pretix/plugins/ticketoutputpdf/exporters.py

@@ -5,7 +5,7 @@ from django import forms
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.db.models.functions import Coalesce
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
 from jsonfallback.functions import JSONExtract
 from PyPDF2.merger import PdfFileMerger
 
@@ -19,7 +19,7 @@ from .ticketoutput import PdfTicketOutput
 
 class AllTicketsPDF(BaseExporter):
     name = "alltickets"
-    verbose_name = ugettext_lazy("All PDF tickets in one file")
+    verbose_name = gettext_lazy("All PDF tickets in one file")
     identifier = "pdfoutput_all_tickets"
 
     @property

src/pretix/plugins/ticketoutputpdf/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.services import tickets
 

src/pretix/plugins/ticketoutputpdf/models.py

@@ -2,7 +2,7 @@ import string
 
 from django.db import models
 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 pretix.base.models import LoggedModel
 

src/pretix/plugins/ticketoutputpdf/signals.py

@@ -4,7 +4,7 @@ import json
 from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.html import escape
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.channels import get_all_sales_channels
 from pretix.base.signals import (  # NOQA: legacy import

src/pretix/plugins/ticketoutputpdf/ticketoutput.py

@@ -9,7 +9,7 @@ from django.core.files.storage import default_storage
 from django.http import HttpRequest
 from django.template.loader import get_template
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from PyPDF2 import PdfFileMerger
 
 from pretix.base.i18n import language

src/pretix/plugins/ticketoutputpdf/views.py

@@ -12,7 +12,7 @@ from django.shortcuts import redirect
 from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.translation import gettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 from django.views import View
 from django.views.generic import CreateView, DeleteView, DetailView, ListView
 from reportlab.lib import pagesizes