From 5be5b8c02bea7cef40046ec29c513e669399633a Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Sat, 6 Aug 2011 00:41:14 -0700
Subject: If no config for a plugin is given, try using self.plugin_config.
Sleek loads a few plugins by default, which made it difficult to
configure or even disable them.
Now, if a plugin is registered without any configuration, then
sleek will try finding a configuration in self.plugin_config.
---
sleekxmpp/basexmpp.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 4d9a8964..816f2fcc 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -198,6 +198,10 @@ class BaseXMPP(XMLStream):
# the sleekxmpp package, so leave out the globals().
module = __import__(module, fromlist=[plugin])
+ # Use the global plugin config cache, if applicable
+ if not pconfig:
+ pconfig = self.plugin_config.get(plugin, {})
+
# Load the plugin class from the module.
self.plugin[plugin] = getattr(module, plugin)(self, pconfig)
--
cgit v1.2.3