jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace _format_jid with a JID method updating both bare and full at the same time.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2016-08-23 01:04:35 +01:00
parent f53b12d227
commit 1e4a301c6e
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
slixmpp/jid.py
View File

@ -303,17 +303,19 @@ class JID:
def __init__(self, jid=None): def __init__(self, jid=None):
if not jid: if not jid:
self._node = None self._node = ''
self._domain = None self._domain = ''
self._resource = None self._resource = ''
self._bare = ''
self._full = ''
return
elif not isinstance(jid, JID): elif not isinstance(jid, JID):
self._node, self._domain, self._resource = _parse_jid(jid) self._node, self._domain, self._resource = _parse_jid(jid)
else: else:
self._node = jid._node self._node = jid._node
self._domain = jid._domain self._domain = jid._domain
self._resource = jid._resource self._resource = jid._resource
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
def unescape(self): def unescape(self):
"""Return an unescaped JID object. """Return an unescaped JID object.
@ -330,37 +332,47 @@ class JID:
self._domain, self._domain,
self._resource) self._resource)
def _update_bare_full(self):
"""Format the given JID into a bare and a full JID.
"""
self._bare = (self._node + '@' + self._domain
if self._node
else self._domain)
self._full = (self._bare + '/' + self._resource
if self._resource
else self._bare)
@property @property
def node(self): def node(self):
return self._node or '' return self._node
@property @property
def user(self): def user(self):
return self._node or '' return self._node
@property @property
def local(self): def local(self):
return self._node or '' return self._node
@property @property
def username(self): def username(self):
return self._node or '' return self._node
@property @property
def domain(self): def domain(self):
return self._domain or '' return self._domain
@property @property
def server(self): def server(self):
return self._domain or '' return self._domain
@property @property
def host(self): def host(self):
return self._domain or '' return self._domain
@property @property
def resource(self): def resource(self):
return self._resource or '' return self._resource
@property @property
def bare(self): def bare(self):
@ -377,44 +389,37 @@ class JID:
@node.setter @node.setter
def node(self, value): def node(self, value):
self._node = _validate_node(value) self._node = _validate_node(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@user.setter @user.setter
def user(self, value): def user(self, value):
self._node = _validate_node(value) self._node = _validate_node(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@local.setter @local.setter
def local(self, value): def local(self, value):
self._node = _validate_node(value) self._node = _validate_node(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@username.setter @username.setter
def username(self, value): def username(self, value):
self._node = _validate_node(value) self._node = _validate_node(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@domain.setter @domain.setter
def domain(self, value): def domain(self, value):
self._domain = _validate_domain(value) self._domain = _validate_domain(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@server.setter @server.setter
def server(self, value): def server(self, value):
self._domain = _validate_domain(value) self._domain = _validate_domain(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@host.setter @host.setter
def host(self, value): def host(self, value):
self._domain = _validate_domain(value) self._domain = _validate_domain(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@bare.setter @bare.setter
def bare(self, value): def bare(self, value):
@ -422,25 +427,22 @@ class JID:
assert not resource assert not resource
self._node = node self._node = node
self._domain = domain self._domain = domain
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@resource.setter @resource.setter
def resource(self, value): def resource(self, value):
self._resource = _validate_resource(value) self._resource = _validate_resource(value)
self._full = _format_jid(self._node, self._domain, self._resource) self._update_bare_full()
@full.setter @full.setter
def full(self, value): def full(self, value):
self._node, self._domain, self._resource = _parse_jid(value) self._node, self._domain, self._resource = _parse_jid(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
@jid.setter @jid.setter
def jid(self, value): def jid(self, value):
self._node, self._domain, self._resource = _parse_jid(value) self._node, self._domain, self._resource = _parse_jid(value)
self._bare = _format_jid(self._node, self._domain) self._update_bare_full()
self._full = _format_jid(self._node, self._domain, self._resource)
def __str__(self): def __str__(self):
"""Use the full JID as the string value.""" """Use the full JID as the string value."""