From 185d7cf28e06a162def8441289f19599d9b4f7c6 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 24 Oct 2010 19:06:54 -0400 Subject: More JID unit tests. sleekxmpp.xmlstream.jid now has 100% coverage! --- sleekxmpp/xmlstream/jid.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'sleekxmpp') 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: -- cgit v1.2.3