diff --git a/src/pretix/base/forms/questions.py b/src/pretix/base/forms/questions.py index 39c16ef0e..a11bb1f0e 100644 --- a/src/pretix/base/forms/questions.py +++ b/src/pretix/base/forms/questions.py @@ -57,7 +57,7 @@ from django.forms.widgets import FILE_INPUT_CONTRADICTION from django.utils.formats import date_format from django.utils.html import escape from django.utils.safestring import mark_safe -from django.utils.timezone import get_current_timezone, now +from django.utils.timezone import get_current_timezone from django.utils.translation import gettext_lazy as _, pgettext_lazy from django_countries import countries from django_countries.fields import Country, CountryField diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index 712f8946a..4f0f24d53 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -55,7 +55,7 @@ from django.db.models import Q 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.timezone import is_naive, make_aware from django.utils.translation import gettext_lazy as _, pgettext_lazy from django_countries.fields import Country from django_scopes import ScopedManager diff --git a/src/tests/presale/test_cart.py b/src/tests/presale/test_cart.py index a2ee58071..94839a810 100644 --- a/src/tests/presale/test_cart.py +++ b/src/tests/presale/test_cart.py @@ -49,7 +49,7 @@ from pretix.base.decimal import round_decimal from pretix.base.models import ( CartPosition, Discount, Event, InvoiceAddress, Item, ItemCategory, ItemVariation, Organizer, Question, QuestionAnswer, Quota, SeatingPlan, - Team, User, Voucher, + Voucher, ) from pretix.base.models.items import ( ItemAddOn, ItemBundle, SubEventItem, SubEventItemVariation, @@ -57,8 +57,10 @@ from pretix.base.models.items import ( from pretix.base.services.cart import CartError, CartManager, error_messages from pretix.testutils.scope import classscope from pretix.testutils.sessions import get_cart_session_key + from .test_timemachine import TimemachineTestMixin + class CartTestMixin: @scopes_disabled() def setUp(self): diff --git a/src/tests/presale/test_checkout.py b/src/tests/presale/test_checkout.py index 752cf4d67..09cd935e9 100644 --- a/src/tests/presale/test_checkout.py +++ b/src/tests/presale/test_checkout.py @@ -56,6 +56,7 @@ from pretix.base.services.tax import VATIDFinalError, VATIDTemporaryError from pretix.base.timemachine import time_machine_now_assigned from pretix.testutils.scope import classscope from pretix.testutils.sessions import get_cart_session_key + from .test_timemachine import TimemachineTestMixin diff --git a/src/tests/presale/test_timemachine.py b/src/tests/presale/test_timemachine.py index 066232fcf..48a230f53 100644 --- a/src/tests/presale/test_timemachine.py +++ b/src/tests/presale/test_timemachine.py @@ -21,7 +21,7 @@ # from django_scopes.state import scopes_disabled -from pretix.base.models import User, Team +from pretix.base.models import Team, User class TimemachineTestMixin: