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

Fix JID cache (wrong in-progress version comitted earlier)

Browse Source
This commit is contained in:
Lance Stout 2012-10-22 20:09:35 -07:00
parent 4598031dd2
commit c5046b9c91
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sleekxmpp/jid.py
View File

@ -421,33 +421,32 @@ class JID(object):
if jid is None or jid == '': if jid is None or jid == '':
jid = '' jid = ''
if jid in JID_CACHE: if not jid:
self._jid = JID_CACHE[jid] jid = (None, None, None)
elif jid in JID_CACHE:
jid = JID_CACHE[jid]
elif not isinstance(jid, JID):
jid = _parse_jid(jid)
else: else:
if not jid: jid = jid._jid
jid = (None, None, None)
elif not isinstance(jid, JID):
jid = _parse_jid(jid)
else:
jid = jid._jid
local, domain, resource = jid local, domain, resource = jid
local = kwargs.get('local', local) local = kwargs.get('local', local)
domain = kwargs.get('domain', domain) domain = kwargs.get('domain', domain)
resource = kwargs.get('resource', resource) resource = kwargs.get('resource', resource)
if 'local' in kwargs: if 'local' in kwargs:
local = _escape_node(local) local = _escape_node(local)
if 'domain' in kwargs: if 'domain' in kwargs:
domain = _validate_domain(domain) domain = _validate_domain(domain)
if 'resource' in kwargs: if 'resource' in kwargs:
resource = _validate_resource(resource) resource = _validate_resource(resource)
self._jid = (local, domain, resource) self._jid = (local, domain, resource)
JID_CACHE[_format_jid(*self._jid)] = self._jid JID_CACHE[_format_jid(*self._jid)] = self._jid
if len(JID_CACHE) > JID_CACHE_MAX_SIZE: if len(JID_CACHE) > JID_CACHE_MAX_SIZE:
JID_CACHE.popitem(False) JID_CACHE.popitem(False)
def unescape(self): def unescape(self):
"""Return an unescaped JID object. """Return an unescaped JID object.