summaryrefslogtreecommitdiff
path: root/slixmpp/plugins/xep_0047/stream.py
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-04-14 17:24:44 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-04-14 19:14:56 +0200
commitc1f23b566b447dbaa4a4ea6942b61128b3161c10 (patch)
tree2b09723d1cf7bd8a545a9426fc4c727748648275 /slixmpp/plugins/xep_0047/stream.py
parent45f7cb8bda42512bad70b6262483ac435209d9c3 (diff)
downloadslixmpp-c1f23b566b447dbaa4a4ea6942b61128b3161c10.tar.gz
slixmpp-c1f23b566b447dbaa4a4ea6942b61128b3161c10.tar.bz2
slixmpp-c1f23b566b447dbaa4a4ea6942b61128b3161c10.tar.xz
slixmpp-c1f23b566b447dbaa4a4ea6942b61128b3161c10.zip
XEP-0047: remove now-useless threading locks.
Diffstat (limited to 'slixmpp/plugins/xep_0047/stream.py')
-rw-r--r--slixmpp/plugins/xep_0047/stream.py19
1 files changed, 7 insertions, 12 deletions
diff --git a/slixmpp/plugins/xep_0047/stream.py b/slixmpp/plugins/xep_0047/stream.py
index 817f96a1..e15a66be 100644
--- a/slixmpp/plugins/xep_0047/stream.py
+++ b/slixmpp/plugins/xep_0047/stream.py
@@ -27,9 +27,6 @@ class IBBytestream(object):
self.send_seq = -1
self.recv_seq = -1
- self._send_seq_lock = threading.Lock()
- self._recv_seq_lock = threading.Lock()
-
self.stream_started = threading.Event()
self.stream_in_closed = threading.Event()
self.stream_out_closed = threading.Event()
@@ -47,9 +44,8 @@ class IBBytestream(object):
raise socket.error
data = data[0:self.block_size]
self.send_window.acquire()
- with self._send_seq_lock:
- self.send_seq = (self.send_seq + 1) % 65535
- seq = self.send_seq
+ self.send_seq = (self.send_seq + 1) % 65535
+ seq = self.send_seq
if self.use_messages:
msg = self.xmpp.Message()
msg['to'] = self.peer_jid
@@ -87,12 +83,11 @@ class IBBytestream(object):
self.close()
def _recv_data(self, stanza):
- with self._recv_seq_lock:
- new_seq = stanza['ibb_data']['seq']
- if new_seq != (self.recv_seq + 1) % 65535:
- self.close()
- raise XMPPError('unexpected-request')
- self.recv_seq = new_seq
+ new_seq = stanza['ibb_data']['seq']
+ if new_seq != (self.recv_seq + 1) % 65535:
+ self.close()
+ raise XMPPError('unexpected-request')
+ self.recv_seq = new_seq
data = stanza['ibb_data']['data']
if len(data) > self.block_size: