From 7baec5a69f432e24c27520258ced29f2393120a5 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Tue, 5 May 2015 16:36:04 -0400 Subject: [PATCH] In load_plugins, check for __init__.py files and avoid adding them into the pluginmap --- confluent_server/confluent/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index 7efa35c9..837fb296 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -82,7 +82,7 @@ def load_plugins(): if plugtype == '.sh': pluginmap[plugin] = shellmodule.Plugin( os.path.join(plugindir, plugin + '.sh')) - else: + elif "__init__" not in plugin: plugins.add(plugin) for plugin in plugins: tmpmod = __import__(plugin)