diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:00:01 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:00:01 -0700 |
| commit | 14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (patch) | |
| tree | 5e72741f828a0f1852086c6be83e23c7f94d10f1 /sleekxmpp/basexmpp.py | |
| parent | 931d49560a1ebf3b767d20f8aeb692dd30a518c3 (diff) | |
| parent | a22ca228cc3a121da8bad4268c39bff5190db969 (diff) | |
| download | slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.gz slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.bz2 slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.xz slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/basexmpp.py')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index f26c048f..4df7f11a 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -69,12 +69,12 @@ class BaseXMPP(XMLStream): self.stream_id = None #: The JabberID (JID) requested for this connection. - self.requested_jid = JID(jid) + self.requested_jid = JID(jid, cache_lock=True) #: The JabberID (JID) used by this connection, #: as set after session binding. This may even be a #: different bare JID than what was requested. - self.boundjid = JID(jid) + self.boundjid = JID(jid, cache_lock=True) self._expected_server_name = self.boundjid.host self._redirect_attempts = 0 @@ -665,7 +665,7 @@ class BaseXMPP(XMLStream): def set_jid(self, jid): """Rip a JID apart and claim it as our own.""" log.debug("setting jid to %s", jid) - self.boundjid.full = jid + self.boundjid = JID(jid, cache_lock=True) def getjidresource(self, fulljid): if '/' in fulljid: |