Merge branch 'jid-barejid' into 'master'
jid: add 'bare' parameter to JID to discard resource See merge request poezio/slixmpp!238
This commit is contained in:
commit
876c82037f
@ -303,13 +303,15 @@ class JID:
|
|||||||
|
|
||||||
:param string jid:
|
:param string jid:
|
||||||
A string of the form ``'[user@]domain[/resource]'``.
|
A string of the form ``'[user@]domain[/resource]'``.
|
||||||
|
:param bool bare:
|
||||||
|
If present, discard the provided resource.
|
||||||
|
|
||||||
:raises InvalidJID:
|
:raises InvalidJID:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__slots__ = ('_node', '_domain', '_resource', '_bare', '_full')
|
__slots__ = ('_node', '_domain', '_resource', '_bare', '_full')
|
||||||
|
|
||||||
def __init__(self, jid: Optional[Union[str, 'JID']] = None):
|
def __init__(self, jid: Optional[Union[str, 'JID']] = None, bare: bool = False):
|
||||||
if not jid:
|
if not jid:
|
||||||
self._node = ''
|
self._node = ''
|
||||||
self._domain = ''
|
self._domain = ''
|
||||||
@ -318,11 +320,14 @@ class JID:
|
|||||||
self._full = ''
|
self._full = ''
|
||||||
return
|
return
|
||||||
elif not isinstance(jid, JID):
|
elif not isinstance(jid, JID):
|
||||||
self._node, self._domain, self._resource = _parse_jid(jid)
|
node, domain, resource = _parse_jid(jid)
|
||||||
|
self._node = node
|
||||||
|
self._domain = domain
|
||||||
|
self._resource = resource if not bare else ''
|
||||||
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 if not bare else ''
|
||||||
self._update_bare_full()
|
self._update_bare_full()
|
||||||
|
|
||||||
def unescape(self):
|
def unescape(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user