comparison src/tools/jid.py @ 688:f7878ad3c846

tools: renamed tools.jid.JID attribute "short" to "bare"
author souliane <souliane@mailoo.org>
date Tue, 29 Oct 2013 16:26:55 +0100
parents 84a6e83157c2
children 1fe00f0c9a91
comparison
equal deleted inserted replaced
687:af0d08a84cc6 688:f7878ad3c846
25 self = unicode.__new__(cls, jid) 25 self = unicode.__new__(cls, jid)
26 self.__parse() 26 self.__parse()
27 return self 27 return self
28 28
29 def __parse(self): 29 def __parse(self):
30 """find node domaine and resource""" 30 """find node domain and resource"""
31 node_end = self.find('@') 31 node_end = self.find('@')
32 if node_end < 0: 32 if node_end < 0:
33 node_end = 0 33 node_end = 0
34 domain_end = self.find('/') 34 domain_end = self.find('/')
35 if domain_end < 1: 35 if domain_end < 1:
36 domain_end = len(self) 36 domain_end = len(self)
37 self.node = self[:node_end] 37 self.node = self[:node_end]
38 self.domain = self[(node_end + 1) if node_end else 0:domain_end] 38 self.domain = self[(node_end + 1) if node_end else 0:domain_end]
39 self.resource = self[domain_end + 1:] 39 self.resource = self[domain_end + 1:]
40 if not node_end: 40 if not node_end:
41 self.short = self 41 self.bare = self
42 else: 42 else:
43 self.short = self.node + '@' + self.domain 43 self.bare = self.node + '@' + self.domain
44 44
45 def is_valid(self): 45 def is_valid(self):
46 """return True if the jid is xmpp compliant""" 46 """return True if the jid is xmpp compliant"""
47 #FIXME: always return True for the moment 47 #TODO: implement real check, according to RFCs
48 return True 48 return self.domain != ""