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/sleektest.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/sleektest.py')
| -rw-r--r-- | sleekxmpp/test/sleektest.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sleekxmpp/test/sleektest.py b/sleekxmpp/test/sleektest.py index cac99f77..47af86cf 100644 --- a/sleekxmpp/test/sleektest.py +++ b/sleekxmpp/test/sleektest.py @@ -8,13 +8,10 @@ import unittest from xml.parsers.expat import ExpatError -try: - import Queue as queue -except: - import queue import sleekxmpp from sleekxmpp import ClientXMPP, ComponentXMPP +from sleekxmpp.util import Queue from sleekxmpp.stanza import Message, Iq, Presence from sleekxmpp.test import TestSocket, TestLiveSocket from sleekxmpp.exceptions import XMPPError, IqTimeout, IqError @@ -338,7 +335,7 @@ class SleekTest(unittest.TestCase): # We will use this to wait for the session_start event # for live connections. - skip_queue = queue.Queue() + skip_queue = Queue() if socket == 'mock': self.xmpp.set_socket(TestSocket()) |