summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/jid.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-13 22:16:46 -0500
committerLance Stout <lancestout@gmail.com>2011-01-13 22:16:46 -0500
commit65931bb384aada922c5287a3ad3cc62d04d6e676 (patch)
tree27297893f7cfa3be0dff1c4be5c81dbbfab6fcb0 /sleekxmpp/xmlstream/jid.py
parenta5d53b3349dc1488da57a7b02758ab1063b4560c (diff)
parent632827f213235ab33f08dc133cf50b2c9287cfd0 (diff)
downloadslixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.gz
slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.bz2
slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.xz
slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/xmlstream/jid.py')
-rw-r--r--sleekxmpp/xmlstream/jid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/jid.py b/sleekxmpp/xmlstream/jid.py
index e5c49dc0..5019a25e 100644
--- a/sleekxmpp/xmlstream/jid.py
+++ b/sleekxmpp/xmlstream/jid.py
@@ -71,7 +71,7 @@ class JID(object):
if self._domain is None:
self._domain = self._jid.split('@', 1)[-1].split('/', 1)[0]
return self._domain or ""
- elif name == 'full':
+ elif name in ('full', 'jid'):
return self._jid or ""
elif name == 'bare':
if self._bare is None: