Change imports to get_grouped_items' new location

src/pretix/base/services/cross_selling.py

@@ -29,7 +29,7 @@ from typing import List
 from django.utils.functional import cached_property
 
 from pretix.base.models import CartPosition, ItemCategory, SalesChannel
-from pretix.presale.utils import get_grouped_items
+from pretix.presale.productlist import get_grouped_items
 
 
 class DummyCategory:

src/pretix/base/services/orders.py

@@ -110,7 +110,7 @@ from pretix.celery_app import app
 from pretix.helpers import OF_SELF
 from pretix.helpers.models import modelcopy
 from pretix.helpers.periodic import minimum_interval
-from pretix.presale.utils import get_grouped_items
+from pretix.presale.productlist import get_grouped_items
 from pretix.testutils.middleware import debugflags_var
 
 

src/pretix/presale/checkoutflow.py

@@ -87,13 +87,14 @@ from pretix.presale.forms.checkout import (
     ContactForm, InvoiceAddressForm, InvoiceNameForm, MembershipForm,
 )
 from pretix.presale.forms.customer import AuthenticationForm, RegistrationForm
+from pretix.presale.productlist import get_grouped_items
 from pretix.presale.signals import (
     checkout_all_optional, checkout_confirm_messages, checkout_flow_steps,
     contact_form_fields, contact_form_fields_overrides,
     order_api_meta_from_request, order_meta_from_request, question_form_fields,
     question_form_fields_overrides,
 )
-from pretix.presale.utils import customer_login, get_grouped_items
+from pretix.presale.utils import customer_login
 from pretix.presale.views import CartMixin, get_cart, get_cart_is_free
 from pretix.presale.views.cart import (
     _items_from_post_data, cart_session, create_empty_cart_id,

src/pretix/presale/views/cart.py

@@ -68,7 +68,9 @@ from pretix.base.timemachine import time_machine_now
 from pretix.base.views.tasks import AsyncAction
 from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
-from pretix.presale.utils import get_grouped_items, item_group_by_category
+from pretix.presale.productlist import (
+    get_grouped_items, item_group_by_category,
+)
 from pretix.presale.views import (
     CartMixin, EventViewMixin, allow_cors_if_namespaced,
     allow_frame_if_namespaced, get_cart, iframe_entry_view_wrapper,

src/pretix/presale/views/event.py

@@ -72,8 +72,10 @@ from pretix.helpers.formats.en.formats import (
 from pretix.helpers.http import redirect_to_url
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.ical import get_public_ical
+from pretix.presale.productlist import (
+    get_grouped_items, item_group_by_category,
+)
 from pretix.presale.signals import seatingframe_html_head
-from pretix.presale.utils import get_grouped_items, item_group_by_category
 from pretix.presale.views.organizer import (
     EventListMixin, add_subevents_for_days, days_for_template,
     filter_qs_by_attr, filter_subevents_with_plugins, has_before_after,

src/pretix/presale/views/order.py

@@ -92,8 +92,8 @@ from pretix.helpers.safedownload import check_token
 from pretix.multidomain.urlreverse import eventreverse, eventreverse_absolute
 from pretix.presale.forms.checkout import InvoiceAddressForm, QuestionsForm
 from pretix.presale.forms.order import OrderPositionChangeForm
+from pretix.presale.productlist import get_grouped_items
 from pretix.presale.signals import question_form_fields_overrides
-from pretix.presale.utils import get_grouped_items
 from pretix.presale.views import (
     CartMixin, EventViewMixin, iframe_entry_view_wrapper,
 )

src/pretix/presale/views/widget.py

@@ -67,8 +67,10 @@ from pretix.helpers.daterange import daterange
 from pretix.helpers.thumb import get_thumbnail
 from pretix.multidomain.urlreverse import eventreverse_absolute
 from pretix.presale.forms.organizer import meta_filtersets
+from pretix.presale.productlist import (
+    get_grouped_items, item_group_by_category,
+)
 from pretix.presale.style import get_theme_vars_css
-from pretix.presale.utils import get_grouped_items, item_group_by_category
 from pretix.presale.views.cart import get_or_create_cart_id
 from pretix.presale.views.organizer import (
     EventListMixin, add_events_for_days, add_subevents_for_days,