diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
| commit | c42f1ad4c79863261977a9c5ea3b33be0b51b946 (patch) | |
| tree | 8eee86ddb082f51dea0866f16146bcd1f4f13c1f /sleekxmpp/test/mocksocket.py | |
| parent | a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe (diff) | |
| parent | 9d8de7fc15afc39a666d2ac16b62a068dfc55112 (diff) | |
| download | slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.gz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.bz2 slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.xz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/test/mocksocket.py')
| -rw-r--r-- | sleekxmpp/test/mocksocket.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sleekxmpp/test/mocksocket.py b/sleekxmpp/test/mocksocket.py index 0920b7ea..4c9d1699 100644 --- a/sleekxmpp/test/mocksocket.py +++ b/sleekxmpp/test/mocksocket.py @@ -7,10 +7,8 @@ """ import socket -try: - import queue -except ImportError: - import Queue as queue + +from sleekxmpp.util import Queue class TestSocket(object): @@ -36,8 +34,8 @@ class TestSocket(object): Same as arguments for socket.socket """ self.socket = socket.socket(*args, **kwargs) - self.recv_queue = queue.Queue() - self.send_queue = queue.Queue() + self.recv_queue = Queue() + self.send_queue = Queue() self.is_live = False self.disconnected = False |