summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2015-05-11 14:28:07 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2015-05-11 20:01:41 (GMT)
commit53101b136cbf05fb70ac7880ff55bb9cd9b09fec (patch)
tree23ce18c09d49fe82091f40133f86acb64a2ac491
parentdfaea1d163a281b2bd372a77d3c7863d01059741 (diff)
downloadcombo-53101b136cbf05fb70ac7880ff55bb9cd9b09fec.zip
combo-53101b136cbf05fb70ac7880ff55bb9cd9b09fec.tar.gz
combo-53101b136cbf05fb70ac7880ff55bb9cd9b09fec.tar.bz2
general: remove middleware support from plugins (#6979)
-rw-r--r--combo/plugins.py11
-rw-r--r--combo/settings.py2
2 files changed, 0 insertions, 13 deletions
diff --git a/combo/plugins.py b/combo/plugins.py
index 3ab487a..f4ee08d 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 25e9bac..fd6ee5f 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',)