From 88b3f588b8ba270101c30352af0bb9260d04a63c Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 5 Apr 2023 11:03:03 +0200 Subject: [PATCH] Fix settings import --- src/pretix/helpers/i18n.py | 3 +-- src/pretix/plugins/paypal2/payment.py | 2 +- src/pretix/plugins/paypal2/signals.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pretix/helpers/i18n.py b/src/pretix/helpers/i18n.py index 47b1047d25..48ab13e98c 100644 --- a/src/pretix/helpers/i18n.py +++ b/src/pretix/helpers/i18n.py @@ -22,11 +22,10 @@ import json import re +from django.conf import settings from django.utils import translation from django.utils.formats import get_format -from pretix import settings - date_conversion_to_moment = { '%a': 'ddd', '%A': 'dddd', diff --git a/src/pretix/plugins/paypal2/payment.py b/src/pretix/plugins/paypal2/payment.py index 20e3254e07..890bd902fe 100644 --- a/src/pretix/plugins/paypal2/payment.py +++ b/src/pretix/plugins/paypal2/payment.py @@ -27,6 +27,7 @@ from collections import OrderedDict from decimal import Decimal from django import forms +from django.conf import settings from django.contrib import messages from django.http import HttpRequest from django.template.loader import get_template @@ -45,7 +46,6 @@ from paypalcheckoutsdk.orders import ( from paypalcheckoutsdk.payments import CapturesRefundRequest, RefundsGetRequest from paypalhttp import HttpError -from pretix import settings from pretix.base.decimal import round_decimal from pretix.base.forms.questions import guess_country from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota diff --git a/src/pretix/plugins/paypal2/signals.py b/src/pretix/plugins/paypal2/signals.py index ffa7abe4a4..fdd694d065 100644 --- a/src/pretix/plugins/paypal2/signals.py +++ b/src/pretix/plugins/paypal2/signals.py @@ -23,6 +23,7 @@ import json from collections import OrderedDict from django import forms +from django.conf import settings from django.dispatch import receiver from django.http import HttpRequest, HttpResponse from django.template.loader import get_template @@ -30,7 +31,6 @@ from django.urls import resolve from django.utils.crypto import get_random_string from django.utils.translation import gettext_lazy as _ -from pretix import settings from pretix.base.forms import SecretKeySettingsField from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp from pretix.base.settings import settings_hierarkey