diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-05-24 19:34:49 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-05-24 19:34:49 -0700 |
| commit | f165b4b52b3bbf1989a6144c3e6417f3756c62b6 (patch) | |
| tree | 84ec8915c1676a4791309ebc82f861f49a4e8c0a /sleekxmpp/basexmpp.py | |
| parent | 7ebc0065167189186ddf53e81a47dab887c87a72 (diff) | |
| parent | 5ca4ede5ac1ddbc56e97010a2f39ed6ada37817e (diff) | |
| download | slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.gz slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.bz2 slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.tar.xz slixmpp-f165b4b52b3bbf1989a6144c3e6417f3756c62b6.zip | |
Merge branch 'master' of git@github.com:fritzy/SleekXMPP
Diffstat (limited to 'sleekxmpp/basexmpp.py')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 83431bd7..292a2088 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -86,7 +86,7 @@ class basexmpp(object): self.username = jid.split('@', 1)[0] self.server = jid.split('@',1)[-1].split('/', 1)[0] - def registerPlugin(self, plugin, pconfig = {}): + def registerPlugin(self, plugin, pconfig = {}, run_post=True): """Register a plugin not in plugins.__init__.__all__ but in the plugins directory.""" # discover relative "path" to the plugins module from the main app, and import it. @@ -100,6 +100,8 @@ class basexmpp(object): if hasattr(self.plugin[plugin], 'xep'): xep = "(XEP-%s) " % self.plugin[plugin].xep logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description)) + if run_post: + self.plugin[plugin].post_init() def register_plugins(self): """Initiates all plugins in the plugins/__init__.__all__""" @@ -109,7 +111,7 @@ class basexmpp(object): plugin_list = plugins.__all__ for plugin in plugin_list: if plugin in plugins.__all__: - self.registerPlugin(plugin, self.plugin_config.get(plugin, {})) + self.registerPlugin(plugin, self.plugin_config.get(plugin, {}), False) else: raise NameError("No plugin by the name of %s listed in plugins.__all__." % plugin) # run post_init() for cross-plugin interaction |