diff options
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 7 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/stanzabase.py | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 26e513a4..92f1f9a6 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -39,6 +39,13 @@ from . stanza.error import Error import logging import threading +import sys + +if sys.version_info < (3,0): + reload(sys) + sys.setdefaultencoding('utf8') + + def stanzaPlugin(stanza, plugin): stanza.plugin_attrib_map[plugin.plugin_attrib] = plugin stanza.plugin_tag_map["{%s}%s" % (plugin.namespace, plugin.name)] = plugin diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index 480e9602..7a5ba4a1 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -18,7 +18,10 @@ class JID(object): if name == 'resource': return self.jid.split('/', 1)[-1] elif name == 'user': - return self.jid.split('@', 1)[0] + if '@' in self.jid: + return self.jid.split('@', 1)[0] + else: + return '' elif name == 'server': return self.jid.split('@', 1)[-1].split('/', 1)[0] elif name == 'full': |