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/base/channels.py

@@ -2,7 +2,7 @@ import logging
 from collections import OrderedDict
 
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.signals import register_sales_channels
 

src/pretix/base/email.py

@@ -9,7 +9,7 @@ from django.core.mail.backends.smtp import EmailBackend
 from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils.timezone import now
-from django.utils.translation import get_language, ugettext_lazy as _
+from django.utils.translation import get_language, gettext_lazy as _
 from inlinestyler.utils import inline_css
 
 from pretix.base.i18n import LazyCurrencyNumber, LazyDate, LazyNumber

src/pretix/base/exporter.py

@@ -7,7 +7,7 @@ from typing import Tuple
 from defusedcsv import csv
 from django import forms
 from django.utils.formats import localize
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 from openpyxl import Workbook
 from openpyxl.cell.cell import KNOWN_TYPES
 
@@ -180,9 +180,9 @@ class MultiSheetListExporter(ListExporter):
         ]
         for s, l in self.sheets:
             choices += [
-                (s + ':default', str(l) + ' – ' + ugettext('CSV (with commas)')),
-                (s + ':excel', str(l) + ' – ' + ugettext('CSV (Excel-style)')),
-                (s + ':semicolon', str(l) + ' – ' + ugettext('CSV (with semicolons)')),
+                (s + ':default', str(l) + ' – ' + gettext('CSV (with commas)')),
+                (s + ':excel', str(l) + ' – ' + gettext('CSV (Excel-style)')),
+                (s + ':semicolon', str(l) + ' – ' + gettext('CSV (with semicolons)')),
             ]
         ff = OrderedDict(
             [

src/pretix/base/exporters/answers.py

@@ -5,7 +5,7 @@ from zipfile import ZipFile
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import QuestionAnswer
 

src/pretix/base/exporters/dekodi.py

@@ -6,7 +6,7 @@ import dateutil
 from django import forms
 from django.core.serializers.json import DjangoJSONEncoder
 from django.dispatch import receiver
-from django.utils.translation import ugettext, ugettext_lazy
+from django.utils.translation import gettext, gettext_lazy
 
 from pretix.base.i18n import language
 from pretix.base.models import Invoice, OrderPayment
@@ -79,7 +79,7 @@ class DekodiNREIExporter(BaseExporter):
                     payments.append({
                         'PTID': '5',
                         'PTN': 'Lastschrift',
-                        'PTNo4': ugettext('Event ticket {event}-{code}').format(
+                        'PTNo4': gettext('Event ticket {event}-{code}').format(
                             event=self.event.slug.upper(),
                             code=invoice.order.code
                         ),
@@ -199,19 +199,19 @@ class DekodiNREIExporter(BaseExporter):
             [
                 ('date_from',
                  forms.DateField(
-                     label=ugettext_lazy('Start date'),
+                     label=gettext_lazy('Start date'),
                      widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=ugettext_lazy('Only include invoices issued on or after this date. Note that the invoice date does '
-                                             'not always correspond to the order or payment date.')
+                     help_text=gettext_lazy('Only include invoices issued on or after this date. Note that the invoice date does '
+                                            'not always correspond to the order or payment date.')
                  )),
                 ('date_to',
                  forms.DateField(
-                     label=ugettext_lazy('End date'),
+                     label=gettext_lazy('End date'),
                      widget=forms.DateInput(attrs={'class': 'datepickerfield'}),
                      required=False,
-                     help_text=ugettext_lazy('Only include invoices issued on or before this date. Note that the invoice date '
-                                             'does not always correspond to the order or payment date.')
+                     help_text=gettext_lazy('Only include invoices issued on or before this date. Note that the invoice date '
+                                            'does not always correspond to the order or payment date.')
                  )),
             ]
         )

src/pretix/base/exporters/invoices.py

@@ -7,7 +7,7 @@ import dateutil.parser
 from django import forms
 from django.db.models import Exists, OuterRef, Q
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import OrderPayment
 

src/pretix/base/exporters/mail.py

@@ -2,7 +2,7 @@ from collections import OrderedDict
 
 from django import forms
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import OrderPosition
 

src/pretix/base/exporters/orderlist.py

@@ -8,7 +8,7 @@ from django.db.models import (
 )
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.translation import pgettext, ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy, pgettext
 
 from pretix.base.models import (
     InvoiceAddress, InvoiceLine, Order, OrderPosition, Question,
@@ -22,7 +22,7 @@ from ..signals import register_data_exporters
 
 class OrderListExporter(MultiSheetListExporter):
     identifier = 'orderlist'
-    verbose_name = ugettext_lazy('Order data')
+    verbose_name = gettext_lazy('Order data')
 
     @property
     def sheets(self):
@@ -414,7 +414,7 @@ class OrderListExporter(MultiSheetListExporter):
 
 class PaymentListExporter(ListExporter):
     identifier = 'paymentlist'
-    verbose_name = ugettext_lazy('Order payments and refunds')
+    verbose_name = gettext_lazy('Order payments and refunds')
 
     @property
     def additional_form_fields(self):
@@ -485,7 +485,7 @@ class PaymentListExporter(ListExporter):
 
 class QuotaListExporter(ListExporter):
     identifier = 'quotalist'
-    verbose_name = ugettext_lazy('Quota availabilities')
+    verbose_name = gettext_lazy('Quota availabilities')
 
     def iterate_list(self, form_data):
         headers = [
@@ -514,7 +514,7 @@ class QuotaListExporter(ListExporter):
 
 class InvoiceDataExporter(MultiSheetListExporter):
     identifier = 'invoicedata'
-    verbose_name = ugettext_lazy('Invoice data')
+    verbose_name = gettext_lazy('Invoice data')
 
     @property
     def sheets(self):

src/pretix/base/forms/__init__.py

@@ -3,7 +3,6 @@ import logging
 import i18nfield.forms
 from django import forms
 from django.forms.models import ModelFormMetaclass
-from django.utils import six
 from django.utils.crypto import get_random_string
 from formtools.wizard.views import SessionWizardView
 from hierarkey.forms import HierarkeyForm
@@ -25,7 +24,7 @@ class BaseI18nModelForm(i18nfield.forms.BaseI18nModelForm):
         super().__init__(*args, **kwargs)
 
 
-class I18nModelForm(six.with_metaclass(ModelFormMetaclass, BaseI18nModelForm)):
+class I18nModelForm(BaseI18nModelForm, metaclass=ModelFormMetaclass):
     pass
 
 

src/pretix/base/forms/auth.py

@@ -3,9 +3,10 @@ from django.conf import settings
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import User
+from pretix.helpers.dicts import move_to_end
 
 
 class LoginForm(forms.Form):
@@ -36,7 +37,7 @@ class LoginForm(forms.Form):
         if not settings.PRETIX_LONG_SESSIONS or backend.url:
             del self.fields['keep_logged_in']
         else:
-            self.fields.move_to_end('keep_logged_in')
+            move_to_end(self.fields, 'keep_logged_in')
 
     def clean(self):
         if all(k in self.cleaned_data for k, f in self.fields.items() if f.required):

src/pretix/base/forms/questions.py

@@ -18,7 +18,7 @@ from django.forms import Select
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import (
-    get_language, pgettext_lazy, ugettext_lazy as _,
+    get_language, gettext_lazy as _, pgettext_lazy,
 )
 from django_countries import countries
 from django_countries.fields import Country, CountryField

src/pretix/base/forms/user.py

@@ -4,7 +4,7 @@ from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from pytz import common_timezones
 
 from pretix.base.models import User

src/pretix/base/forms/validators.py

@@ -2,7 +2,7 @@ import re
 
 from django.core.exceptions import ValidationError
 from django.core.validators import BaseValidator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from i18nfield.strings import LazyI18nString
 
 

src/pretix/base/forms/widgets.py

@@ -4,7 +4,7 @@ from django import forms
 from django.utils.formats import get_format
 from django.utils.functional import lazy
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class DatePickerWidget(forms.DateInput):

src/pretix/base/i18n.py

@@ -3,7 +3,7 @@ from contextlib import contextmanager
 from django.conf import settings
 from django.utils import translation
 from django.utils.formats import date_format, number_format
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from i18nfield.fields import (  # noqa
     I18nCharField, I18nTextarea, I18nTextField, I18nTextInput,
 )
@@ -69,6 +69,6 @@ class LazyLocaleException(Exception):
 
     def __str__(self):
         if self.msgargs:
-            return ugettext(self.msg) % self.msgargs
+            return gettext(self.msg) % self.msgargs
         else:
-            return ugettext(self.msg)
+            return gettext(self.msg)

src/pretix/base/invoice.py

@@ -10,7 +10,7 @@ from django.contrib.staticfiles import finders
 from django.dispatch import receiver
 from django.utils.formats import date_format, localize
 from django.utils.translation import (
-    get_language, pgettext, ugettext, ugettext_lazy,
+    get_language, gettext, gettext_lazy, pgettext,
 )
 from PIL.Image import BICUBIC
 from reportlab.lib import pagesizes
@@ -423,7 +423,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
             canvas.saveState()
             canvas.setFont('OpenSansBd', 30)
             canvas.setFillColorRGB(32, 0, 0)
-            canvas.drawRightString(self.pagesize[0] - 20 * mm, (297 - 100) * mm, ugettext('TEST MODE'))
+            canvas.drawRightString(self.pagesize[0] - 20 * mm, (297 - 100) * mm, gettext('TEST MODE'))
             canvas.restoreState()
 
     def _on_first_page(self, canvas: Canvas, doc):
@@ -688,7 +688,7 @@ class ClassicInvoiceRenderer(BaseReportlabInvoiceRenderer):
 
 class Modern1Renderer(ClassicInvoiceRenderer):
     identifier = 'modern1'
-    verbose_name = ugettext_lazy('Modern Invoice Renderer (pretix 2.7)')
+    verbose_name = gettext_lazy('Modern Invoice Renderer (pretix 2.7)')
     bottom_margin = 16.9 * mm
     top_margin = 16.9 * mm
     right_margin = 20 * mm

src/pretix/base/migrations/0077_auto_20171124_1629.py

@@ -6,7 +6,7 @@ import django.core.validators
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import pretix.base.validators
 from pretix.base.i18n import language

src/pretix/base/migrations/0077_auto_20171124_1629_squashed_0088_auto_20180328_1217.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 from django.db.models import F
 from django.db.models.functions import Concat
 from django.utils.crypto import get_random_string
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 import pretix.base.models.auth
 import pretix.base.validators

src/pretix/base/models/auth.py

@@ -14,7 +14,7 @@ from django.db import models
 from django.db.models import Q
 from django.utils.crypto import get_random_string, salted_hmac
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_otp.models import Device
 from django_scopes import scopes_disabled
 from u2flib_server.utils import (

src/pretix/base/models/checkin.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.db.models import Exists, OuterRef
 from django.utils.timezone import now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
 
 from pretix.base.models import LoggedModel

src/pretix/base/models/devices.py

@@ -3,7 +3,7 @@ import string
 from django.db import models
 from django.db.models import Max
 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 django_scopes import ScopedManager, scopes_disabled
 
 from pretix.base.models import LoggedModel

src/pretix/base/models/event.py

@@ -17,7 +17,7 @@ from django.template.defaultfilters import date as _date
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.fields import I18nCharField, I18nTextField
 

src/pretix/base/models/giftcards.py

@@ -5,7 +5,7 @@ from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models import Sum
 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.banlist import banned
 from pretix.base.models import LoggedModel
@@ -83,6 +83,7 @@ class GiftCard(LoggedModel):
 
     class Meta:
         unique_together = (('secret', 'issuer'),)
+        ordering = ("issuance",)
 
 
 class GiftCardTransaction(models.Model):

src/pretix/base/models/items.py

@@ -16,7 +16,7 @@ from django.utils import formats
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.timezone import is_naive, make_aware, now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country
 from django_scopes import ScopedManager
 from i18nfield.fields import I18nCharField, I18nTextField

src/pretix/base/models/log.py

@@ -6,7 +6,7 @@ from django.db import models
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.html import escape
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
 from pretix.base.signals import logentry_object_link
 

src/pretix/base/models/notifications.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 NotificationSetting(models.Model):

src/pretix/base/models/orders.py

@@ -26,7 +26,7 @@ from django.utils.encoding import escape_uri_path
 from django.utils.formats import date_format
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries.fields import Country, CountryField
 from django_scopes import ScopedManager, scopes_disabled
 from i18nfield.strings import LazyI18nString

src/pretix/base/models/organizer.py

@@ -5,7 +5,7 @@ from django.db import models
 from django.db.models import Exists, OuterRef, Q
 from django.utils.crypto import get_random_string
 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.base.models.base import LoggedModel
 from pretix.base.validators import OrganizerSlugBanlistValidator

src/pretix/base/models/seating.py

@@ -8,7 +8,7 @@ from django.db import models
 from django.db.models import F, Q
 from django.utils.deconstruct import deconstructible
 from django.utils.timezone import now
-from django.utils.translation import gettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 
 from pretix.base.models import Event, Item, LoggedModel, Organizer, SubEvent
 

src/pretix/base/models/tax.py

@@ -4,7 +4,7 @@ from decimal import Decimal
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.formats import localize
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 from i18nfield.fields import I18nCharField
 

src/pretix/base/models/vouchers.py

@@ -8,7 +8,7 @@ from django.db.models import F, OuterRef, Q, Subquery, Sum
 from django.db.models.functions import Coalesce
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager, scopes_disabled
 
 from pretix.base.banlist import banned

src/pretix/base/models/waitinglist.py

@@ -3,7 +3,7 @@ from datetime import timedelta
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.utils.timezone import now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_scopes import ScopedManager
 
 from pretix.base.email import get_email_context

src/pretix/base/notifications.py

@@ -3,7 +3,7 @@ from collections import OrderedDict, namedtuple
 
 from django.dispatch import receiver
 from django.utils.formats import date_format
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 
 from pretix.base.models import Event, LogEntry
 from pretix.base.signals import register_notification_types

src/pretix/base/payment.py

@@ -17,7 +17,7 @@ from django.http import HttpRequest
 from django.template.loader import get_template
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
-from django.utils.translation import pgettext_lazy, ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _, pgettext_lazy
 from django_countries import Countries
 from i18nfield.forms import I18nFormField, I18nTextarea, I18nTextInput
 from i18nfield.strings import LazyI18nString

src/pretix/base/pdf.py

@@ -17,7 +17,7 @@ from django.dispatch import receiver
 from django.utils.formats import date_format
 from django.utils.html import conditional_escape
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from PyPDF2 import PdfFileReader
 from pytz import timezone
 from reportlab.graphics import renderPDF

src/pretix/base/reldate.py

@@ -7,7 +7,7 @@ from dateutil import parser
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 BASE_CHOICES = (

src/pretix/base/services/cart.py

@@ -9,7 +9,7 @@ from django.db import DatabaseError, transaction
 from django.db.models import Count, Exists, OuterRef, Q
 from django.dispatch import receiver
 from django.utils.timezone import make_aware, now
-from django.utils.translation import pgettext_lazy, ugettext as _
+from django.utils.translation import gettext as _, pgettext_lazy
 from django_scopes import scopes_disabled
 
 from pretix.base.channels import get_all_sales_channels
@@ -213,7 +213,7 @@ class CartManager:
                 has_variations=Count('variations'),
             ).filter(
                 id__in=[i for i in item_ids if i and i not in self._items_cache]
-            )
+            ).order_by()
         })
         self._variations_cache.update({
             v.pk: v
@@ -221,7 +221,7 @@ class CartManager:
                 'quotas'
             ).select_related('item', 'item__event').filter(
                 id__in=[i for i in variation_ids if i and i not in self._variations_cache]
-            )
+            ).order_by()
         })
 
     def _check_max_cart_size(self):

src/pretix/base/services/checkin.py

@@ -2,7 +2,7 @@ from django.db import transaction
 from django.db.models import Prefetch
 from django.dispatch import receiver
 from django.utils.timezone import now
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from pretix.base.models import (
     Checkin, CheckinList, Order, OrderPosition, Question, QuestionOption,

src/pretix/base/services/export.py

@@ -2,7 +2,7 @@ from typing import Any, Dict
 
 from django.core.files.base import ContentFile
 from django.utils.timezone import override
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from pretix.base.i18n import LazyLocaleException, language
 from pretix.base.models import CachedFile, Event, cachedfile_name
@@ -26,7 +26,7 @@ def export(event: Event, fileid: str, provider: str, form_data: Dict[str, Any])
                 d = ex.render(form_data)
                 if d is None:
                     raise ExportError(
-                        ugettext('Your export did not contain any data.')
+                        gettext('Your export did not contain any data.')
                     )
                 file.filename, file.type, data = d
                 file.file.save(cachedfile_name(file, file.filename), ContentFile(data))

src/pretix/base/services/invoices.py

@@ -15,7 +15,7 @@ from django.dispatch import receiver
 from django.utils import timezone
 from django.utils.formats import date_format
 from django.utils.timezone import now
-from django.utils.translation import pgettext, ugettext as _
+from django.utils.translation import gettext as _, pgettext
 from django_countries.fields import Country
 from django_scopes import scope, scopes_disabled
 from i18nfield.strings import LazyI18nString

src/pretix/base/services/mail.py

@@ -20,7 +20,7 @@ from django.core.mail import (
 )
 from django.core.mail.message import SafeMIMEText
 from django.template.loader import get_template
-from django.utils.translation import pgettext, ugettext as _
+from django.utils.translation import gettext as _, pgettext
 from django_scopes import scope, scopes_disabled
 from i18nfield.strings import LazyI18nString
 

src/pretix/base/services/orders.py

@@ -15,7 +15,7 @@ from django.db.transaction import get_connection
 from django.dispatch import receiver
 from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
 
 from pretix.api.models import OAuthApplication

src/pretix/base/services/seating.py

@@ -1,5 +1,5 @@
 from django.db.models import Count, Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.i18n import LazyLocaleException
 from pretix.base.models import CartPosition, Seat
@@ -25,7 +25,7 @@ def validate_plan_change(event, subevent, plan):
             subevent=subevent,
         ).filter(
             Q(has_v=True) | Q(has_op=True)
-        ).values_list('seat_guid', flat=True)
+        ).values_list('seat_guid', flat=True).order_by()
     )
     new_seats = {
         ss.guid for ss in plan.iter_all_seats()
@@ -40,7 +40,7 @@ def generate_seats(event, subevent, plan, mapping):
     current_seats = {}
     for s in event.seats.select_related('product').annotate(
             has_op=Count('orderposition'), has_v=Count('vouchers')
-    ).filter(subevent=subevent):
+    ).filter(subevent=subevent).order_by():
         if s.seat_guid in current_seats:
             s.delete()  # Duplicates should not exist
         else:

src/pretix/base/services/shredder.py

@@ -8,7 +8,7 @@ from dateutil.parser import parse
 from django.conf import settings
 from django.utils.crypto import get_random_string
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import CachedFile, Event, cachedfile_name
 from pretix.base.services.tasks import ProfiledEventTask

src/pretix/base/services/stats.py

@@ -6,7 +6,7 @@ from django.db.models import (
     Case, Count, DateTimeField, F, Max, OuterRef, Subquery, Sum, Value, When,
 )
 from django.utils.timezone import make_aware
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import Event, Item, ItemCategory, Order, OrderPosition
 from pretix.base.models.event import SubEvent

src/pretix/base/services/tickets.py

@@ -3,7 +3,7 @@ import os
 
 from django.core.files.base import ContentFile
 from django.utils.timezone import now
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
 
 from pretix.base.i18n import language

src/pretix/base/services/update_check.py

@@ -5,7 +5,7 @@ from datetime import timedelta
 import requests
 from django.dispatch import receiver
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _, ugettext_noop
+from django.utils.translation import gettext_lazy as _, gettext_noop
 from django_scopes import scopes_disabled
 from i18nfield.strings import LazyI18nString
 
@@ -91,7 +91,7 @@ def send_update_notification_email():
         gs.settings.update_check_email,
         _('pretix update available'),
         LazyI18nString.from_gettext(
-            ugettext_noop(
+            gettext_noop(
                 'Hi!\n\nAn update is available for pretix or for one of the plugins you installed in your '
                 'pretix installation. Please click on the following link for more information:\n\n {url} \n\n'
                 'You can always find information on the latest updates on the pretix.eu blog:\n\n'

src/pretix/base/settings.py

@@ -11,7 +11,7 @@ from django.core.files import File
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db.models import Model
 from django.utils.translation import (
-    pgettext, pgettext_lazy, ugettext_lazy as _, ugettext_noop,
+    gettext_lazy as _, gettext_noop, pgettext, pgettext_lazy,
 )
 from django_countries import countries
 from hierarkey.models import GlobalSettingsBase, Hierarkey
@@ -1006,7 +1006,7 @@ DEFAULTS = {
     },
     'mail_text_resend_link': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 you receive this message because you asked us to send you the link
 to your order for {event}.
@@ -1019,7 +1019,7 @@ Your {event} team"""))
     },
     'mail_text_resend_all_links': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 somebody requested a list of your orders for {event}.
 The list is as follows:
@@ -1031,7 +1031,7 @@ Your {event} team"""))
     },
     'mail_text_order_free_attendee': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello {attendee_name},
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
 
 you have been registered for {event} successfully.
 
@@ -1043,7 +1043,7 @@ Your {event} team"""))
     },
     'mail_text_order_free': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 your order for {event} was successful. As you only ordered free products,
 no payment is required.
@@ -1060,7 +1060,7 @@ Your {event} team"""))
     },
     'mail_text_order_placed_require_approval': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 we successfully received your order for {event}. Since you ordered
 a product that requires approval by the event organizer, we ask you to
@@ -1074,7 +1074,7 @@ Your {event} team"""))
     },
     'mail_text_order_placed': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 we successfully received your order for {event} with a total value
 of {total_with_currency}. Please complete your payment before {expire_date}.
@@ -1093,7 +1093,7 @@ Your {event} team"""))
     },
     'mail_text_order_placed_attendee': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello {attendee_name},
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
 
 a ticket for {event} has been ordered for you.
 
@@ -1105,7 +1105,7 @@ Your {event} team"""))
     },
     'mail_text_order_changed': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 your order for {event} has been changed.
 
@@ -1117,7 +1117,7 @@ Your {event} team"""))
     },
     'mail_text_order_paid': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 we successfully received your payment for {event}. Thank you!
 
@@ -1135,7 +1135,7 @@ Your {event} team"""))
     },
     'mail_text_order_paid_attendee': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello {attendee_name},
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
 
 a ticket for {event} that has been ordered for you is now paid.
 
@@ -1151,7 +1151,7 @@ Your {event} team"""))
     },
     'mail_text_order_expire_warning': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 we did not yet receive a full payment for your order for {event}.
 Please keep in mind that we only guarantee your order if we receive
@@ -1165,7 +1165,7 @@ Your {event} team"""))
     },
     'mail_text_waiting_list': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 you submitted yourself to the waiting list for {event},
 for the product {product}.
@@ -1188,7 +1188,7 @@ Your {event} team"""))
     },
     'mail_text_order_canceled': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 your order {code} for {event} has been canceled.
 
@@ -1200,7 +1200,7 @@ Your {event} team"""))
     },
     'mail_text_order_approved': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 we approved your order for {event} and will be happy to welcome you
 at our event.
@@ -1216,7 +1216,7 @@ Your {event} team"""))
     },
     'mail_text_order_denied': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 unfortunately, we denied your order request for {event}.
 
@@ -1231,7 +1231,7 @@ Your {event} team"""))
     },
     'mail_text_order_custom_mail': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 You can change your order details and view the status of your order at
 {url}
@@ -1249,7 +1249,7 @@ Your {event} team"""))
     },
     'mail_text_download_reminder_attendee': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello {attendee_name},
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name},
 
 you are registered for {event}.
 
@@ -1261,7 +1261,7 @@ Your {event} team"""))
     },
     'mail_text_download_reminder': {
         'type': LazyI18nString,
-        'default': LazyI18nString.from_gettext(ugettext_noop("""Hello,
+        'default': LazyI18nString.from_gettext(gettext_noop("""Hello,
 
 you bought a ticket for {event}.
 
@@ -1391,7 +1391,7 @@ Your {event} team"""))
         )
     },
     'checkout_email_helptext': {
-        'default': LazyI18nString.from_gettext(ugettext_noop(
+        'default': LazyI18nString.from_gettext(gettext_noop(
             'Make sure to enter a valid email address. We will send you an order '
             'confirmation including a link that you need to access your order later.'
         )),

src/pretix/base/shredder.py

@@ -7,7 +7,7 @@ from django.db.models import Max, Q
 from django.db.models.functions import Greatest
 from django.dispatch import receiver
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.api.serializers.order import (
     AnswerSerializer, InvoiceAddressSerializer,

src/pretix/base/templatetags/rich_text.py

@@ -7,7 +7,7 @@ from django import template
 from django.conf import settings
 from django.core import signing
 from django.urls import reverse
-from django.utils.http import is_safe_url
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.safestring import mark_safe
 
 register = template.Library()
@@ -66,7 +66,7 @@ ALLOWED_PROTOCOLS = ['http', 'https', 'mailto', 'tel']
 
 def safelink_callback(attrs, new=False):
     url = attrs.get((None, 'href'), '/')
-    if not is_safe_url(url, allowed_hosts=None) and not url.startswith('mailto:') and not url.startswith('tel:'):
+    if not url_has_allowed_host_and_scheme(url, allowed_hosts=None) and not url.startswith('mailto:') and not url.startswith('tel:'):
         signer = signing.Signer(salt='safe-redirect')
         attrs[None, 'href'] = reverse('redirect') + '?url=' + urllib.parse.quote(signer.sign(url))
         attrs[None, 'target'] = '_blank'

src/pretix/base/ticketoutput.py

@@ -6,7 +6,7 @@ from zipfile import ZipFile
 
 from django import forms
 from django.http import HttpRequest
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from pretix.base.models import Event, Order, OrderPosition
 from pretix.base.settings import SettingsSandbox

src/pretix/base/validators.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.deconstruct import deconstructible
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class BanlistValidator:

src/pretix/base/views/errors.py

@@ -5,7 +5,7 @@ from django.middleware.csrf import REASON_NO_CSRF_COOKIE, REASON_NO_REFERER
 from django.template import TemplateDoesNotExist, loader
 from django.template.loader import get_template
 from django.utils.functional import Promise
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.csrf import requires_csrf_token
 from sentry_sdk import last_event_id
 

src/pretix/base/views/tasks.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from pretix.celery_app import app