From 53101b136cbf05fb70ac7880ff55bb9cd9b09fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 11 May 2015 16:28:07 +0200 Subject: [PATCH] general: remove middleware support from plugins (#6979) --- combo/plugins.py | 11 ----------- combo/settings.py | 2 -- 2 files changed, 13 deletions(-) diff --git a/combo/plugins.py b/combo/plugins.py index 3ab487aa..f4ee08d1 100644 --- a/combo/plugins.py +++ b/combo/plugins.py @@ -64,17 +64,6 @@ def register_plugins_apps(installed_apps): if app not in installed_apps) return installed_apps -def register_plugins_middleware(middlewares): - middlewares = tuple(middlewares) - for plugin in get_plugins(): - if hasattr(plugin, 'get_before_middleware'): - middlewares = tuple(m for m in plugin.get_before_middleware() - if m not in middlewares) + middlewares - if hasattr(plugin, 'get_after_middleware'): - middlewares += tuple(m for m in plugin.get_after_middleware() - if m not in middlewares) - return middlewares - def get_extra_manager_actions(): '''This iterates over all appconfigs and returns a list of dictionaries, with href and text keys.''' diff --git a/combo/settings.py b/combo/settings.py index 25e9bac1..fd6ee5f3 100644 --- a/combo/settings.py +++ b/combo/settings.py @@ -73,8 +73,6 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -MIDDLEWARE_CLASSES = plugins.register_plugins_middleware(MIDDLEWARE_CLASSES) - # Serve xstatic files, required for gadjo STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \ ('gadjo.finders.XStaticFinder',)