diff options
| author | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
| commit | e5e2fbb16b4d9c11fc676925c6a13943282a3c66 (patch) | |
| tree | 5dc018384ad03253608ff79c9fdbb577b84d2d2f /sleekxmpp/basexmpp.py | |
| parent | a20582aba4de85f5a193395df2d0ed8c75220bfb (diff) | |
| parent | 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 (diff) | |
| download | slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.gz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.bz2 slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.xz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.zip | |
Merge pull request #311 from Mayflower/develop
Revert "cleanup semicolons, whitespace and mutable default arguments"
Diffstat (limited to 'sleekxmpp/basexmpp.py')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 8cd61b63..bf0ae4df 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -25,6 +25,7 @@ from sleekxmpp.exceptions import IqError, IqTimeout from sleekxmpp.stanza import Message, Presence, Iq, StreamError from sleekxmpp.stanza.roster import Roster from sleekxmpp.stanza.nick import Nick +from sleekxmpp.stanza.htmlim import HTMLIM from sleekxmpp.xmlstream import XMLStream, JID from sleekxmpp.xmlstream import ET, register_stanza_plugin @@ -244,7 +245,7 @@ class BaseXMPP(XMLStream): self.plugin[name].post_inited = True return XMLStream.process(self, *args, **kwargs) - def register_plugin(self, plugin, pconfig=None, module=None): + def register_plugin(self, plugin, pconfig={}, module=None): """Register and configure a plugin for use in this stream. :param plugin: The name of the plugin class. Plugin names must |