Revert "First steps into pytz deprecation"

This reverts commit e4e7d50659.

src/tests/plugins/banktransfer/test_api.py

@@ -21,12 +21,13 @@
 #
 import copy
 import json
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 from unittest import mock
 
 import pytest
 from django.utils.timezone import now
 from django_scopes import scopes_disabled
+from pytz import UTC
 
 from pretix.base.models import (
     Event, Item, Order, OrderPosition, Organizer, Quota, Team, User,
@@ -88,7 +89,7 @@ RES_JOB = {
 
 @pytest.mark.django_db
 def test_api_list(env, client):
-    testtime = datetime(2017, 12, 1, 10, 0, 0, tzinfo=timezone.utc)
+    testtime = datetime(2017, 12, 1, 10, 0, 0, tzinfo=UTC)
 
     with mock.patch('django.utils.timezone.now') as mock_now:
         mock_now.return_value = testtime
@@ -108,7 +109,7 @@ def test_api_list(env, client):
 
 @pytest.mark.django_db
 def test_api_detail(env, client):
-    testtime = datetime(2017, 12, 1, 10, 0, 0, tzinfo=timezone.UTC)
+    testtime = datetime(2017, 12, 1, 10, 0, 0, tzinfo=UTC)
 
     with mock.patch('django.utils.timezone.now') as mock_now:
         mock_now.return_value = testtime

src/tests/plugins/sendmail/test_rules.py

@@ -21,9 +21,9 @@
 #
 
 import datetime
-from zoneinfo import ZoneInfo
 
 import pytest
+import pytz
 from django.core import mail as djmail
 from django.utils.timezone import now, utc
 from django_scopes import scopes_disabled
@@ -46,8 +46,8 @@ def test_sendmail_rule_create_single(event):
 
 
 dt_now = now()
-NZ = ZoneInfo('NZ')
-Berlin = ZoneInfo('Europe/Berlin')
+NZ = pytz.timezone('NZ')
+Berlin = pytz.timezone('Europe/Berlin')
 
 
 @pytest.mark.django_db
@@ -101,28 +101,28 @@ Berlin = ZoneInfo('Europe/Berlin')
             datetime.datetime(2020, 2, 29, 9, tzinfo=utc)
         ),
         (  # Test timezone far off from UTC
-            datetime.datetime(2021, 5, 17, 22, tzinfo=NZ),
+            NZ.localize(datetime.datetime(2021, 5, 17, 22)),
             None,
             'NZ',
             Rule(date_is_absolute=False, offset_is_after=True, send_offset_days=1, send_offset_time=datetime.time(hour=9)),
-            datetime.datetime(2021, 5, 18, 9, tzinfo=NZ)
+            NZ.localize(datetime.datetime(2021, 5, 18, 9))
         ),
         (  # Test across DST change
-            datetime.datetime(2021, 10, 29, 16, 30, tzinfo=Berlin),
+            Berlin.localize(datetime.datetime(2021, 10, 29, 16, 30)),
             None,
             'Europe/Berlin',
             Rule(date_is_absolute=False, offset_is_after=True, send_offset_days=4, send_offset_time=datetime.time(hour=2, minute=30)),
-            datetime.datetime(2021, 11, 2, 2, 30, tzinfo=Berlin)
+            Berlin.localize(datetime.datetime(2021, 11, 2, 2, 30))
         ),
         (  # Test ambiguous time at DST change
-            datetime.datetime(2021, 10, 29, 18, 30, tzinfo=Berlin),
+            Berlin.localize(datetime.datetime(2021, 10, 29, 18, 30)),
             None,
             'Europe/Berlin',
             Rule(date_is_absolute=False, offset_is_after=True, send_offset_days=2, send_offset_time=datetime.time(hour=2, minute=30)),
             datetime.datetime(2021, 10, 31, 1, 30, tzinfo=utc)
         ),
         (  # Test non-existing time at DST change
-            datetime.datetime(2021, 3, 29, 14, 30, tzinfo=Berlin),
+            Berlin.localize(datetime.datetime(2021, 3, 29, 14, 30)),
             None,
             'Europe/Berlin',
             Rule(date_is_absolute=False, offset_is_after=False, send_offset_days=1, send_offset_time=datetime.time(hour=2, minute=30)),

src/tests/plugins/test_checkinlist.py

@@ -23,6 +23,7 @@ import datetime
 from decimal import Decimal
 
 import pytest
+import pytz
 from django.utils.timezone import now
 from django_scopes import scope
 
@@ -50,7 +51,7 @@ def event():
         order_paid = Order.objects.create(
             code='FOO', event=event, email='dummy@dummy.test', phone="+498912345678",
             status=Order.STATUS_PAID,
-            datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=datetime.timezone.utc), expires=now() + datetime.timedelta(days=10),
+            datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=pytz.UTC), expires=now() + datetime.timedelta(days=10),
             total=33, locale='en'
         )
         item_ticket = Item.objects.create(event=event, name="Ticket", default_price=23, admission=True)
@@ -146,7 +147,7 @@ def test_csv_order_by_inherited_name_parts(event):  # noqa
         order2 = Order.objects.create(
             code='BAR', event=event, email='dummy@dummy.test', phone='+498912345678',
             status=Order.STATUS_PAID,
-            datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=datetime.timezone.utc), expires=now() + datetime.timedelta(days=10),
+            datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=pytz.UTC), expires=now() + datetime.timedelta(days=10),
             total=33, locale='en'
         )
         OrderPosition.objects.create(