summaryrefslogtreecommitdiff
path: root/slixmpp/xmlstream
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-09-21 19:28:13 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-09-28 23:58:46 +0200
commit61f89eef2eac74821fae12e0389e58dc1a05a075 (patch)
tree715e7ae2f4dadad73f3c274c32d6283073cffeba /slixmpp/xmlstream
parent06de587ed2f7e6439fb2f67a2c64a96a757778ad (diff)
downloadslixmpp-61f89eef2eac74821fae12e0389e58dc1a05a075.tar.gz
slixmpp-61f89eef2eac74821fae12e0389e58dc1a05a075.tar.bz2
slixmpp-61f89eef2eac74821fae12e0389e58dc1a05a075.tar.xz
slixmpp-61f89eef2eac74821fae12e0389e58dc1a05a075.zip
Remove the now useless Queue wrapper in slixmpp.util.
Diffstat (limited to 'slixmpp/xmlstream')
-rw-r--r--slixmpp/xmlstream/handler/collector.py4
-rw-r--r--slixmpp/xmlstream/handler/waiter.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/slixmpp/xmlstream/handler/collector.py b/slixmpp/xmlstream/handler/collector.py
index 03868187..d9e20279 100644
--- a/slixmpp/xmlstream/handler/collector.py
+++ b/slixmpp/xmlstream/handler/collector.py
@@ -10,8 +10,8 @@
"""
import logging
+from queue import Queue, Empty
-from slixmpp.util import Queue, QueueEmpty
from slixmpp.xmlstream.handler.base import BaseHandler
@@ -59,7 +59,7 @@ class Collector(BaseHandler):
try:
while True:
results.append(self._payload.get(False))
- except QueueEmpty:
+ except Empty:
pass
self.stream().remove_handler(self.name)
diff --git a/slixmpp/xmlstream/handler/waiter.py b/slixmpp/xmlstream/handler/waiter.py
index c8bc2e55..c25063db 100644
--- a/slixmpp/xmlstream/handler/waiter.py
+++ b/slixmpp/xmlstream/handler/waiter.py
@@ -10,8 +10,8 @@
"""
import logging
+from queue import Queue, Empty
-from slixmpp.util import Queue, QueueEmpty
from slixmpp.xmlstream.handler.base import BaseHandler
@@ -71,7 +71,7 @@ class Waiter(BaseHandler):
try:
stanza = self._payload.get(True, 1)
break
- except QueueEmpty:
+ except Empty:
elapsed_time += 1
if elapsed_time >= timeout:
log.warning("Timed out waiting for %s", self.name)