Remove more threaded= and block= options from the plugins

(also, correct a typo)

2 files changed, 10 insertions, 15 deletions

diff --git a/slixmpp/plugins/xep_0047/ibb.py b/slixmpp/plugins/xep_0047/ibb.py
index 7c01c78a..87cd1f51 100644
--- a/slixmpp/plugins/xep_0047/ibb.py
+++ b/slixmpp/plugins/xep_0047/ibb.py
@@ -116,7 +116,7 @@ class XEP_0047(BasePlugin):
             self._preauthed_sids[(jid, sid, ifrom)] = True
 
     def open_stream(self, jid, block_size=None, sid=None, window=1, use_messages=False,
-                    ifrom=None, block=True, timeout=None, callback=None):
+                    ifrom=None, timeout=None, callback=None):
         if sid is None:
             sid = str(uuid.uuid4())
         if block_size is None:
@@ -139,20 +139,15 @@ class XEP_0047(BasePlugin):
 
         self._pending_streams[iq['id']] = stream
 
-        if block:
-            resp = iq.send(timeout=timeout)
-            self._handle_opened_stream(resp)
-            return stream
+        cb = None
+        if callback is not None:
+            def chained(resp):
+                self._handle_opened_stream(resp)
+                callback(resp)
+            cb = chained
         else:
-            cb = None
-            if callback is not None:
-                def chained(resp):
-                    self._handle_opened_stream(resp)
-                    callback(resp)
-                cb = chained
-            else:
-                cb = self._handle_opened_stream
-            return iq.send(block=block, timeout=timeout, callback=cb)
+            cb = self._handle_opened_stream
+        return iq.send(timeout=timeout, callback=cb)
 
     def _handle_opened_stream(self, iq):
         if iq['type'] == 'result':
diff --git a/slixmpp/plugins/xep_0047/stream.py b/slixmpp/plugins/xep_0047/stream.py
index ba0b2cec..817f96a1 100644
--- a/slixmpp/plugins/xep_0047/stream.py
+++ b/slixmpp/plugins/xep_0047/stream.py
@@ -70,7 +70,7 @@ class IBBytestream(object):
             iq['ibb_data']['data'] = data
             self.window_empty.clear()
             self.window_ids.add(iq['id'])
-            iq.send(block=False, callback=self._recv_ack)
+            iq.send(callback=self._recv_ack)
         return len(data)
 
     def sendall(self, data):