From 1efdc1e44fff48b6d7419769dc6a4d96299e2948 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 4 May 2016 18:11:26 +0200 Subject: [PATCH] Moved CORE_MODULES to a setting --- src/pretix/base/migrations/0020_auto_20160421_1943.py | 1 + src/pretix/base/signals.py | 5 ++--- src/pretix/settings.py | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/migrations/0020_auto_20160421_1943.py b/src/pretix/base/migrations/0020_auto_20160421_1943.py index c2390dc58d..b6e5143b88 100644 --- a/src/pretix/base/migrations/0020_auto_20160421_1943.py +++ b/src/pretix/base/migrations/0020_auto_20160421_1943.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models + import pretix.base.i18n diff --git a/src/pretix/base/signals.py b/src/pretix/base/signals.py index 5d982f121d..46b8ed03e8 100644 --- a/src/pretix/base/signals.py +++ b/src/pretix/base/signals.py @@ -1,12 +1,11 @@ import django.dispatch from django.apps import apps +from django.conf import settings from django.dispatch.dispatcher import NO_RECEIVERS from typing import Any, Callable, List, Tuple from .models import Event -CORE_MODULES = {("pretix", "base"), ("pretix", "presale"), ("pretix", "control")} - class EventPluginSignal(django.dispatch.Signal): """ @@ -42,7 +41,7 @@ class EventPluginSignal(django.dispatch.Signal): searchpath, mod = searchpath.rsplit(".", 1) # Only fire receivers from active plugins and core modules - if (searchpath, mod) in CORE_MODULES or (app and app.name in sender.get_plugins()): + if (searchpath, mod) in settings.CORE_MODULES or (app and app.name in sender.get_plugins()): if not hasattr(app, 'compatibility_errors') or not app.compatibility_errors: response = receiver(signal=self, sender=sender, **named) responses.append((receiver, response)) diff --git a/src/pretix/settings.py b/src/pretix/settings.py index dcf2d743d6..3ff04429f2 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -167,6 +167,12 @@ INSTALLED_APPS = [ for entry_point in iter_entry_points(group='pretix.plugin', name=None): INSTALLED_APPS.append(entry_point.module_name) +CORE_MODULES = { + ("pretix", "base"), + ("pretix", "presale"), + ("pretix", "control") +} + MIDDLEWARE_CLASSES = [ 'pretix.multidomain.middlewares.MultiDomainMiddleware', 'pretix.multidomain.middlewares.SessionMiddleware',