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/clientxmpp.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/clientxmpp.py')
| -rw-r--r-- | slixmpp/clientxmpp.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/slixmpp/clientxmpp.py b/slixmpp/clientxmpp.py index d1fd65a9..40d20333 100644 --- a/slixmpp/clientxmpp.py +++ b/slixmpp/clientxmpp.py @@ -50,7 +50,6 @@ class ClientXMPP(BaseXMPP): :param jid: The JID of the XMPP user account. :param password: The password for the XMPP user account. - :param ssl: **Deprecated.** :param plugin_config: A dictionary of plugin configurations. :param plugin_whitelist: A list of approved plugins that will be loaded when calling @@ -58,9 +57,15 @@ class ClientXMPP(BaseXMPP): :param escape_quotes: **Deprecated.** """ - def __init__(self, jid, password, plugin_config={}, plugin_whitelist=[], - escape_quotes=True, sasl_mech=None, lang='en'): - BaseXMPP.__init__(self, jid, 'jabber:client') + def __init__(self, jid, password, plugin_config=None, + plugin_whitelist=None, escape_quotes=True, sasl_mech=None, + lang='en', **kwargs): + if not plugin_whitelist: + plugin_whitelist = [] + if not plugin_config: + plugin_config = {} + + BaseXMPP.__init__(self, jid, 'jabber:client', **kwargs) self.escape_quotes = escape_quotes self.plugin_config = plugin_config |