diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 22:50:03 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 22:50:03 +0100 |
| commit | 2ce023a991d8edd52bb10186105a7725188cd8ac (patch) | |
| tree | 69f3addbd34a8de58983636784651946029d0cf2 /test | |
| parent | d8e8dfc1c6136c709bb3286c2f058a8ac101acc0 (diff) | |
| download | mitmproxy-2ce023a991d8edd52bb10186105a7725188cd8ac.tar.gz mitmproxy-2ce023a991d8edd52bb10186105a7725188cd8ac.tar.bz2 mitmproxy-2ce023a991d8edd52bb10186105a7725188cd8ac.zip | |
py3++
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_flow.py | 6 | ||||
| -rw-r--r-- | test/mitmproxy/tools/passive_close.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 0d9a2e8d..993db876 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -1,4 +1,4 @@ -import Queue +from six.moves import queue import time import os.path from six.moves import cStringIO as StringIO @@ -853,7 +853,7 @@ class TestFlowMaster: assert not fm.start_client_playback(pb, False) fm.client_playback.testing = True - q = Queue.Queue() + q = queue.Queue() assert not fm.state.flow_count() fm.tick(q, 0) assert fm.state.flow_count() @@ -909,7 +909,7 @@ class TestFlowMaster: False, None, False) - q = Queue.Queue() + q = queue.Queue() fm.tick(q, 0) assert fm.should_exit.is_set() diff --git a/test/mitmproxy/tools/passive_close.py b/test/mitmproxy/tools/passive_close.py index 5b1bd451..4b657f8d 100644 --- a/test/mitmproxy/tools/passive_close.py +++ b/test/mitmproxy/tools/passive_close.py @@ -1,8 +1,8 @@ -import SocketServer +from six.moves import socketserver from time import sleep -class service(SocketServer.BaseRequestHandler): +class service(socketserver.BaseRequestHandler): def handle(self): data = 'dummy' @@ -16,7 +16,7 @@ class service(SocketServer.BaseRequestHandler): sleep(3600) -class ThreadedTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): +class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): pass server = ThreadedTCPServer(('', 1520), service) |