summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-24 19:06:54 -0400
committerLance Stout <lancestout@gmail.com>2010-10-24 19:06:54 -0400
commit185d7cf28e06a162def8441289f19599d9b4f7c6 (patch)
treefc664628848bd4f90e6d070a3ae7ab26eac07fc0 /sleekxmpp/xmlstream
parent8aa3d0c0476d3a704069d324c03d2703e5e2ad76 (diff)
downloadslixmpp-185d7cf28e06a162def8441289f19599d9b4f7c6.tar.gz
slixmpp-185d7cf28e06a162def8441289f19599d9b4f7c6.tar.bz2
slixmpp-185d7cf28e06a162def8441289f19599d9b4f7c6.tar.xz
slixmpp-185d7cf28e06a162def8441289f19599d9b4f7c6.zip
More JID unit tests.
sleekxmpp.xmlstream.jid now has 100% coverage!
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/jid.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/sleekxmpp/xmlstream/jid.py b/sleekxmpp/xmlstream/jid.py
index 149611b7..33d845a0 100644
--- a/sleekxmpp/xmlstream/jid.py
+++ b/sleekxmpp/xmlstream/jid.py
@@ -94,21 +94,15 @@ class JID(object):
elif name in ('server', 'domain', 'host'):
self.domain = value
elif name in ('full', 'jid'):
- if '@' not in value:
- if '/' in value:
- d, r = value.split('/', 1)
- object.__setattr__(self, "_resource", r)
- else:
- d = value
- object.__setattr__(self, "_domain", d)
- else:
- self.reset(value)
+ self.reset(value)
+ self.regenerate()
elif name == 'bare':
if '@' in value:
u, d = value.split('@', 1)
object.__setattr__(self, "_user", u)
object.__setattr__(self, "_domain", d)
else:
+ object.__setattr__(self, "_user", '')
object.__setattr__(self, "_domain", value)
self.regenerate()
else: