pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Lance Stout 2012-10-22 20:10:07 -07:00
commit 3655827ef2
2 changed files with 23 additions and 24 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 == '':
jid = ''
if jid in JID_CACHE:
self._jid = JID_CACHE[jid]
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)
else:
if not jid:
jid = (None, None, None)
elif not isinstance(jid, JID):
jid = _parse_jid(jid)
else:
jid = jid._jid
jid = jid._jid
local, domain, resource = jid
local, domain, resource = jid
local = kwargs.get('local', local)
domain = kwargs.get('domain', domain)
resource = kwargs.get('resource', resource)
local = kwargs.get('local', local)
domain = kwargs.get('domain', domain)
resource = kwargs.get('resource', resource)
if 'local' in kwargs:
local = _escape_node(local)
if 'domain' in kwargs:
domain = _validate_domain(domain)
if 'resource' in kwargs:
resource = _validate_resource(resource)
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[_format_jid(*self._jid)] = self._jid
if len(JID_CACHE) > JID_CACHE_MAX_SIZE:
JID_CACHE.popitem(False)
self._jid = (local, domain, resource)
JID_CACHE[_format_jid(*self._jid)] = self._jid
if len(JID_CACHE) > JID_CACHE_MAX_SIZE:
JID_CACHE.popitem(False)
def unescape(self):
"""Return an unescaped JID object.

4
sleekxmpp/roster/item.py
View file

@ -479,11 +479,11 @@ class RosterItem(object):
self.xmpp.event('roster_subscription_removed', presence)
def handle_probe(self, presence):
if self['to']:
if self['from']:
self.send_last_presence()
if self['pending_out']:
self.subscribe()
if not self['to']:
if not self['from']:
self._unsubscribed()
def reset(self):