From 648cc14ae04c607cea84f81c741fc88f461d798f Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Thu, 4 Apr 2024 12:49:00 +0200 Subject: [PATCH] Move timemachine to pretix.base, revert package refactor --- src/pretix/base/{middleware/__init__.py => middleware.py} | 0 src/pretix/base/models/event.py | 2 +- src/pretix/base/models/items.py | 2 +- src/pretix/base/models/orders.py | 2 +- src/pretix/base/services/memberships.py | 2 +- src/pretix/base/services/orders.py | 2 +- src/pretix/base/{middleware => }/timemachine.py | 0 src/pretix/settings.py | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename src/pretix/base/{middleware/__init__.py => middleware.py} (100%) rename src/pretix/base/{middleware => }/timemachine.py (100%) diff --git a/src/pretix/base/middleware/__init__.py b/src/pretix/base/middleware.py similarity index 100% rename from src/pretix/base/middleware/__init__.py rename to src/pretix/base/middleware.py diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 93cb68303c..03bca6ea9d 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -64,10 +64,10 @@ from django.utils.translation import gettext, gettext_lazy as _ from django_scopes import ScopedManager, scopes_disabled from i18nfield.fields import I18nCharField, I18nTextField -from pretix.base.middleware.timemachine import time_machine_now from pretix.base.models.base import LoggedModel from pretix.base.models.fields import MultiStringField from pretix.base.reldate import RelativeDateWrapper +from pretix.base.timemachine import time_machine_now from pretix.base.validators import EventSlugBanlistValidator from pretix.helpers.database import GroupConcat from pretix.helpers.daterange import daterange diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index 889b553e9f..3588426096 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -61,11 +61,11 @@ from django_countries.fields import Country from django_scopes import ScopedManager from i18nfield.fields import I18nCharField, I18nTextField -from pretix.base.middleware.timemachine import time_machine_now from pretix.base.models import fields from pretix.base.models.base import LoggedModel from pretix.base.models.fields import MultiStringField from pretix.base.models.tax import TaxedPrice +from pretix.base.timemachine import time_machine_now from ...helpers.images import ImageSizeValidator from ..media import MEDIA_TYPES diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 413d59c274..c6015f3357 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -76,11 +76,11 @@ from pretix.base.banlist import banned from pretix.base.decimal import round_decimal from pretix.base.email import get_email_context from pretix.base.i18n import language -from pretix.base.middleware.timemachine import time_machine_now from pretix.base.models import Customer, User from pretix.base.reldate import RelativeDateWrapper from pretix.base.settings import PERSON_NAME_SCHEMES from pretix.base.signals import allow_ticket_download, order_gracefully_delete +from pretix.base.timemachine import time_machine_now from ...helpers import OF_SELF from ...helpers.countries import CachedCountries, FastCountryField diff --git a/src/pretix/base/services/memberships.py b/src/pretix/base/services/memberships.py index c27d718cd6..fc52d76cc2 100644 --- a/src/pretix/base/services/memberships.py +++ b/src/pretix/base/services/memberships.py @@ -27,11 +27,11 @@ from django.core.exceptions import ValidationError from django.utils.formats import date_format from django.utils.translation import gettext_lazy as _ -from pretix.base.middleware.timemachine import time_machine_now from pretix.base.models import ( AbstractPosition, CartPosition, Customer, Event, Item, Membership, Order, OrderPosition, SubEvent, ) +from pretix.base.timemachine import time_machine_now from pretix.helpers import OF_SELF diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index c0d96bb18c..a11cdfa091 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -66,7 +66,6 @@ from pretix.base.channels import get_all_sales_channels from pretix.base.email import get_email_context from pretix.base.i18n import get_language_without_region, language from pretix.base.media import MEDIA_TYPES -from pretix.base.middleware.timemachine import time_machine_now from pretix.base.models import ( CartPosition, Device, Event, GiftCard, Item, ItemVariation, Membership, Order, OrderPayment, OrderPosition, Quota, Seat, SeatCategoryMapping, User, @@ -103,6 +102,7 @@ from pretix.base.signals import ( order_fee_calculation, order_paid, order_placed, order_split, order_valid_if_pending, periodic_task, validate_order, ) +from pretix.base.timemachine import time_machine_now from pretix.celery_app import app from pretix.helpers import OF_SELF from pretix.helpers.models import modelcopy diff --git a/src/pretix/base/middleware/timemachine.py b/src/pretix/base/timemachine.py similarity index 100% rename from src/pretix/base/middleware/timemachine.py rename to src/pretix/base/timemachine.py diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 4fdc9f8382..a27eadfe90 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -454,7 +454,7 @@ MIDDLEWARE = [ 'pretix.base.middleware.LocaleMiddleware', 'pretix.base.middleware.SecurityMiddleware', 'pretix.presale.middleware.EventMiddleware', - 'pretix.base.middleware.timemachine.TimeMachineMiddleware', + 'pretix.base.timemachine.TimeMachineMiddleware', 'pretix.api.middleware.ApiScopeMiddleware', ]