From 3e43b36a9d70801d90a6b09046f93879f2e29b89 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 24 Jul 2012 02:39:54 -0700 Subject: Standardize importing of queue class. This will make it easier to enable gevent support. --- sleekxmpp/xmlstream/handler/waiter.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sleekxmpp/xmlstream/handler') diff --git a/sleekxmpp/xmlstream/handler/waiter.py b/sleekxmpp/xmlstream/handler/waiter.py index 899df17c..66e14496 100644 --- a/sleekxmpp/xmlstream/handler/waiter.py +++ b/sleekxmpp/xmlstream/handler/waiter.py @@ -10,11 +10,8 @@ """ import logging -try: - import queue -except ImportError: - import Queue as queue +from sleekxmpp.util import Queue, QueueEmpty from sleekxmpp.xmlstream.handler.base import BaseHandler @@ -37,7 +34,7 @@ class Waiter(BaseHandler): def __init__(self, name, matcher, stream=None): BaseHandler.__init__(self, name, matcher, stream=stream) - self._payload = queue.Queue() + self._payload = Queue() def prerun(self, payload): """Store the matched stanza when received during processing. @@ -74,7 +71,7 @@ class Waiter(BaseHandler): try: stanza = self._payload.get(True, 1) break - except queue.Empty: + except QueueEmpty: elapsed_time += 1 if elapsed_time >= timeout: log.warning("Timed out waiting for %s", self.name) -- cgit v1.2.3