From 72bf4a290862e7936b59c414ae697fa2be6e4055 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Fri, 28 Feb 2025 19:41:43 +0100 Subject: [PATCH] Fix imports --- src/pretix/base/datasync/datasync.py | 13 +++++++------ src/pretix/base/datasync/sourcefields.py | 4 +++- src/pretix/control/datasync.py | 3 ++- src/pretix/control/forms/mapping.py | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/pretix/base/datasync/datasync.py b/src/pretix/base/datasync/datasync.py index 05b9d641cd..79c214aff8 100644 --- a/src/pretix/base/datasync/datasync.py +++ b/src/pretix/base/datasync/datasync.py @@ -1,3 +1,4 @@ +import json import logging from collections import namedtuple from datetime import datetime, timedelta @@ -8,16 +9,16 @@ import sentry_sdk from django.db import models from django.db.models import Q from django.dispatch import receiver -from django_scopes import scopes_disabled, scope - -from pretix.base.datasync.sourcefields import get_data_fields, ORDER, EVENT, EVENT_OR_SUBEVENT, ORDER_POSITION -from pretix.base.models import Order, Event from django.utils.translation import gettext_lazy as _ +from django_scopes import scope, scopes_disabled +from pretix.base.datasync.sourcefields import ( + EVENT, EVENT_OR_SUBEVENT, ORDER, ORDER_POSITION, get_data_fields, +) +from pretix.base.models import Event, Order from pretix.base.services.tasks import TransactionAwareTask -from pretix.base.signals import periodic_task, EventPluginRegistry +from pretix.base.signals import EventPluginRegistry, periodic_task from pretix.celery_app import app -import json logger = logging.getLogger(__name__) diff --git a/src/pretix/base/datasync/sourcefields.py b/src/pretix/base/datasync/sourcefields.py index 6c621f9400..4d8ad64910 100644 --- a/src/pretix/base/datasync/sourcefields.py +++ b/src/pretix/base/datasync/sourcefields.py @@ -1,7 +1,9 @@ import json +from functools import partial + from django.db.models import Max from django.utils.translation import gettext_lazy as _ -from functools import partial + from pretix.base.models import Checkin, Order, Question from pretix.base.settings import PERSON_NAME_SCHEMES diff --git a/src/pretix/control/datasync.py b/src/pretix/control/datasync.py index 537a81e9fe..30f11cf0b2 100644 --- a/src/pretix/control/datasync.py +++ b/src/pretix/control/datasync.py @@ -3,12 +3,13 @@ from django.dispatch import receiver from django.http import HttpResponseNotAllowed from django.shortcuts import redirect from django.template.loader import get_template +from django.utils.translation import gettext_lazy as _ from pretix.base.datasync.datasync import sync_targets from pretix.base.models import Event, Order from pretix.control.signals import order_info from pretix.control.views.orders import OrderView -from django.utils.translation import gettext_lazy as _ + @receiver(order_info, dispatch_uid="datasync_control_order_info") def on_control_order_info(sender: Event, request, order: Order, **kwargs): diff --git a/src/pretix/control/forms/mapping.py b/src/pretix/control/forms/mapping.py index adbba528e8..7f8ee4419c 100644 --- a/src/pretix/control/forms/mapping.py +++ b/src/pretix/control/forms/mapping.py @@ -2,8 +2,11 @@ from django import forms from django.forms import formset_factory from django.utils.translation import gettext_lazy as _ +from pretix.base.datasync.datasync import ( + MODE_APPEND_LIST, MODE_OVERWRITE, MODE_SET_IF_EMPTY, MODE_SET_IF_NEW, +) from pretix.base.datasync.sourcefields import QUESTION_TYPE_IDENTIFIERS -from pretix.base.datasync.datasync import MODE_SET_IF_NEW, MODE_SET_IF_EMPTY, MODE_OVERWRITE, MODE_APPEND_LIST + class PropertyMappingForm(forms.Form): pretix_field = forms.CharField()