diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-24 02:39:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-24 02:39:54 -0700 |
| commit | 3e43b36a9d70801d90a6b09046f93879f2e29b89 (patch) | |
| tree | 758b0f60cb569605a91900fcbfd10d7bc364a243 /sleekxmpp/xmlstream/scheduler.py | |
| parent | 352ee2f2fd6458a46e046ecaedb78addd5d6ac20 (diff) | |
| download | slixmpp-3e43b36a9d70801d90a6b09046f93879f2e29b89.tar.gz slixmpp-3e43b36a9d70801d90a6b09046f93879f2e29b89.tar.bz2 slixmpp-3e43b36a9d70801d90a6b09046f93879f2e29b89.tar.xz slixmpp-3e43b36a9d70801d90a6b09046f93879f2e29b89.zip | |
Standardize importing of queue class.
This will make it easier to enable gevent support.
Diffstat (limited to 'sleekxmpp/xmlstream/scheduler.py')
| -rw-r--r-- | sleekxmpp/xmlstream/scheduler.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py index f68af081..d98dc6c8 100644 --- a/sleekxmpp/xmlstream/scheduler.py +++ b/sleekxmpp/xmlstream/scheduler.py @@ -15,10 +15,8 @@ import time import threading import logging -try: - import queue -except ImportError: - import Queue as queue + +from sleekxmpp.util import Queue, QueueEmpty log = logging.getLogger(__name__) @@ -102,7 +100,7 @@ class Scheduler(object): def __init__(self, parentstop=None): #: A queue for storing tasks - self.addq = queue.Queue() + self.addq = Queue() #: A list of tasks in order of execution time. self.schedule = [] @@ -157,7 +155,7 @@ class Scheduler(object): elapsed < wait: newtask = self.addq.get(True, 0.1) elapsed += 0.1 - except queue.Empty: + except QueueEmpty: cleanup = [] self.schedule_lock.acquire() for task in self.schedule: |