Revert "First steps into pytz deprecation"

This reverts commit e4e7d50659.

src/pretix/base/models/event.py

@@ -40,9 +40,8 @@ from collections import OrderedDict
 from datetime import datetime, time, timedelta
 from operator import attrgetter
 from urllib.parse import urljoin
-from zoneinfo import ZoneInfo
 
-import pytz_deprecation_shim
+import pytz
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
@@ -215,7 +214,7 @@ class EventMixin:
 
     @property
     def timezone(self):
-        return pytz_deprecation_shim.timezone(self.settings.timezone)
+        return pytz.timezone(self.settings.timezone)
 
     @property
     def effective_presale_end(self):
@@ -719,7 +718,7 @@ class Event(EventMixin, LoggedModel):
         """
         The last datetime of payments for this event.
         """
-        tz = ZoneInfo(self.settings.timezone)
+        tz = pytz.timezone(self.settings.timezone)
         return make_aware(datetime.combine(
             self.settings.get('payment_term_last', as_type=RelativeDateWrapper).datetime(self).date(),
             time(hour=23, minute=59, second=59)

src/pretix/base/models/items.py

@@ -39,9 +39,9 @@ from collections import Counter, OrderedDict
 from datetime import date, datetime, time
 from decimal import Decimal, DecimalException
 from typing import Tuple
-from zoneinfo import ZoneInfo
 
 import dateutil.parser
+import pytz
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator, RegexValidator
@@ -1474,7 +1474,7 @@ class Question(LoggedModel):
             try:
                 dt = dateutil.parser.parse(answer)
                 if is_naive(dt):
-                    dt = make_aware(dt, ZoneInfo(self.event.settings.timezone))
+                    dt = make_aware(dt, pytz.timezone(self.event.settings.timezone))
             except:
                 raise ValidationError(_('Invalid datetime input.'))
             else:

src/pretix/base/models/orders.py

@@ -42,10 +42,10 @@ from collections import Counter
 from datetime import datetime, time, timedelta
 from decimal import Decimal
 from typing import Any, Dict, List, Union
-from zoneinfo import ZoneInfo
 
 import dateutil
 import pycountry
+import pytz
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
@@ -485,7 +485,7 @@ class Order(LockModel, LoggedModel):
 
     def set_expires(self, now_dt=None, subevents=None):
         now_dt = now_dt or now()
-        tz = ZoneInfo(self.event.settings.timezone)
+        tz = pytz.timezone(self.event.settings.timezone)
         mode = self.event.settings.get('payment_term_mode')
         if mode == 'days':
             exp_by_date = now_dt.astimezone(tz) + timedelta(days=self.event.settings.get('payment_term_days', as_type=int))
@@ -856,7 +856,7 @@ class Order(LockModel, LoggedModel):
 
     @property
     def payment_term_last(self):
-        tz = ZoneInfo(self.event.settings.timezone)
+        tz = pytz.timezone(self.event.settings.timezone)
         term_last = self.event.settings.get('payment_term_last', as_type=RelativeDateWrapper)
         if term_last:
             if self.event.has_subevents:
@@ -1216,7 +1216,7 @@ class QuestionAnswer(models.Model):
             try:
                 d = dateutil.parser.parse(self.answer)
                 if self.orderposition:
-                    tz = ZoneInfo(self.orderposition.order.event.settings.timezone)
+                    tz = pytz.timezone(self.orderposition.order.event.settings.timezone)
                     d = d.astimezone(tz)
                 return date_format(d, "SHORT_DATETIME_FORMAT")
             except ValueError:

src/pretix/base/models/organizer.py

@@ -35,7 +35,7 @@
 import string
 from datetime import date, datetime, time
 
-import pytz_deprecation_shim
+import pytz
 from django.conf import settings
 from django.core.mail import get_connection
 from django.core.validators import MinLengthValidator, RegexValidator
@@ -140,7 +140,7 @@ class Organizer(LoggedModel):
 
     @property
     def timezone(self):
-        return pytz_deprecation_shim.timezone(self.settings.timezone)
+        return pytz.timezone(self.settings.timezone)
 
     @cached_property
     def all_logentries_link(self):