diff options
| author | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
| commit | ada9444bf84bd238238c4d22561f69184dd22cdd (patch) | |
| tree | ceb4f86446b4129ec22cb348f1cb1bd7a151e2da /slixmpp/basexmpp.py | |
| parent | 1100ff1febf7e605e03fd9565bdac5fdaa3bf1e0 (diff) | |
| parent | acc52fd935b7e74919ad748f3a630596f66c62af (diff) | |
| download | slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.gz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.bz2 slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.xz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.zip | |
Merge branch 'sleek-merge'
Diffstat (limited to 'slixmpp/basexmpp.py')
| -rw-r--r-- | slixmpp/basexmpp.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/slixmpp/basexmpp.py b/slixmpp/basexmpp.py index 80699319..83741bd7 100644 --- a/slixmpp/basexmpp.py +++ b/slixmpp/basexmpp.py @@ -22,7 +22,6 @@ from slixmpp.exceptions import IqError, IqTimeout from slixmpp.stanza import Message, Presence, Iq, StreamError from slixmpp.stanza.roster import Roster from slixmpp.stanza.nick import Nick -from slixmpp.stanza.htmlim import HTMLIM from slixmpp.xmlstream import XMLStream, JID from slixmpp.xmlstream import ET, register_stanza_plugin @@ -46,8 +45,8 @@ class BaseXMPP(XMLStream): is used during initialization. """ - def __init__(self, jid='', default_ns='jabber:client'): - XMLStream.__init__(self) + def __init__(self, jid='', default_ns='jabber:client', **kwargs): + XMLStream.__init__(self, **kwargs) self.default_ns = default_ns self.stream_ns = 'http://etherx.jabber.org/streams' @@ -221,7 +220,7 @@ class BaseXMPP(XMLStream): self.plugin[name].post_init() self.plugin[name].post_inited = True - def register_plugin(self, plugin, pconfig={}, module=None): + def register_plugin(self, plugin, pconfig=None, module=None): """Register and configure a plugin for use in this stream. :param plugin: The name of the plugin class. Plugin names must |