summaryrefslogtreecommitdiff
path: root/sleekxmpp/jid.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-24 13:00:01 -0700
committerLance Stout <lancestout@gmail.com>2012-10-24 13:00:01 -0700
commit14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (patch)
tree5e72741f828a0f1852086c6be83e23c7f94d10f1 /sleekxmpp/jid.py
parent931d49560a1ebf3b767d20f8aeb692dd30a518c3 (diff)
parenta22ca228cc3a121da8bad4268c39bff5190db969 (diff)
downloadslixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.gz
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.bz2
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.xz
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/jid.py')
-rw-r--r--sleekxmpp/jid.py60
1 files changed, 37 insertions, 23 deletions
diff --git a/sleekxmpp/jid.py b/sleekxmpp/jid.py
index eac51dad..feab4082 100644
--- a/sleekxmpp/jid.py
+++ b/sleekxmpp/jid.py
@@ -16,6 +16,7 @@ from __future__ import unicode_literals
import re
import socket
import stringprep
+import threading
import encodings.idna
from sleekxmpp.util import stringprep_profiles
@@ -65,6 +66,7 @@ JID_UNESCAPE_TRANSFORMATIONS = {'\\20': ' ',
'\\5c': '\\'}
JID_CACHE = OrderedDict()
+JID_CACHE_LOCK = threading.Lock()
JID_CACHE_MAX_SIZE = 1024
@@ -416,37 +418,49 @@ class JID(object):
# pylint: disable=W0212
def __init__(self, jid=None, **kwargs):
- self._jid = (None, None, None)
+ jid_data = (jid, kwargs.get('local', None),
+ kwargs.get('domain', None),
+ kwargs.get('resource', None))
- if jid is None or jid == '':
- jid = ''
+ locked = kwargs.get('cache_lock', False)
- if not jid:
- jid = (None, None, None)
- elif jid in JID_CACHE:
- jid = JID_CACHE[jid]
- elif not isinstance(jid, JID):
- jid = _parse_jid(jid)
+ if jid_data in JID_CACHE:
+ parsed_jid, locked = JID_CACHE[jid_data]
+ self._jid = parsed_jid
else:
- jid = jid._jid
+ if jid is None:
+ jid = ''
- local, domain, resource = jid
+ if not jid:
+ parsed_jid = (None, None, None)
+ elif not isinstance(jid, JID):
+ parsed_jid = _parse_jid(jid)
+ else:
+ parsed_jid = jid._jid
- local = kwargs.get('local', local)
- domain = kwargs.get('domain', domain)
- resource = kwargs.get('resource', resource)
+ local, domain, resource = parsed_jid
- if 'local' in kwargs:
- local = _escape_node(local)
- if 'domain' in kwargs:
- domain = _validate_domain(domain)
- if 'resource' in kwargs:
- resource = _validate_resource(resource)
+ local = kwargs.get('local', local)
+ domain = kwargs.get('domain', domain)
+ resource = kwargs.get('resource', resource)
- self._jid = (local, domain, resource)
- JID_CACHE[_format_jid(*self._jid)] = self._jid
+ if 'local' in kwargs:
+ local = _escape_node(local)
+ if 'domain' in kwargs:
+ domain = _validate_domain(domain)
+ if 'resource' in kwargs:
+ resource = _validate_resource(resource)
+
+ self._jid = (local, domain, resource)
+
+ JID_CACHE[jid_data] = (self._jid, locked)
if len(JID_CACHE) > JID_CACHE_MAX_SIZE:
- JID_CACHE.popitem(False)
+ with JID_CACHE_LOCK:
+ key, item = JID_CACHE.popitem(False)
+ if item[1]:
+ # Need to reinsert locked JIDs
+ JID_CACHE[key] = item
+
def unescape(self):
"""Return an unescaped JID object.