diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-01-24 23:24:59 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-01-25 09:20:44 +0100 |
| commit | 1b487539b1f3ea183eaed26ae756d0cc7d3ec3ea (patch) | |
| tree | ce105012045a86019879f605ece2f12e5e9ecd0b | |
| parent | 0ca0469d6e87420f88fe4089338e8a0ba04e4428 (diff) | |
| download | mitmproxy-1b487539b1f3ea183eaed26ae756d0cc7d3ec3ea.tar.gz mitmproxy-1b487539b1f3ea183eaed26ae756d0cc7d3ec3ea.tar.bz2 mitmproxy-1b487539b1f3ea183eaed26ae756d0cc7d3ec3ea.zip | |
move tservers to netlib module
| -rw-r--r-- | netlib/tservers.py (renamed from test/tservers.py) | 2 | ||||
| -rw-r--r-- | test/http/http2/test_protocol.py | 3 | ||||
| -rw-r--r-- | test/test_tcp.py | 3 | ||||
| -rw-r--r-- | test/websockets/test_websockets.py | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/test/tservers.py b/netlib/tservers.py index c47d6a5f..44ef8063 100644 --- a/test/tservers.py +++ b/netlib/tservers.py @@ -1,8 +1,10 @@ from __future__ import (absolute_import, print_function, division) + import threading from six.moves import queue from io import StringIO import OpenSSL + from netlib import tcp from netlib import tutils diff --git a/test/http/http2/test_protocol.py b/test/http/http2/test_protocol.py index 6bda96f5..0beec950 100644 --- a/test/http/http2/test_protocol.py +++ b/test/http/http2/test_protocol.py @@ -1,12 +1,11 @@ import OpenSSL import mock -from netlib import tcp, http, tutils +from netlib import tcp, http, tutils, tservers from netlib.exceptions import TcpDisconnect from netlib.http import Headers from netlib.http.http2.connections import HTTP2Protocol, TCPHandler from netlib.http.http2.frame import * -from ... import tservers class TestTCPHandlerWrapper: def test_wrapped(self): diff --git a/test/test_tcp.py b/test/test_tcp.py index 68d54b78..738fb2eb 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -10,8 +10,7 @@ import mock from OpenSSL import SSL import OpenSSL -from netlib import tcp, certutils, tutils -from . import tservers +from netlib import tcp, certutils, tutils, tservers from netlib.exceptions import InvalidCertificateException, TcpReadIncomplete, TlsException, \ TcpTimeout, TcpDisconnect, TcpException diff --git a/test/websockets/test_websockets.py b/test/websockets/test_websockets.py index 9a1e5d3d..d53f0d83 100644 --- a/test/websockets/test_websockets.py +++ b/test/websockets/test_websockets.py @@ -2,12 +2,11 @@ import os from netlib.http.http1 import read_response, read_request -from netlib import tcp, tutils, websockets, http +from netlib import tcp, websockets, http, tutils, tservers from netlib.http import status_codes from netlib.tutils import treq from netlib.exceptions import * -from .. import tservers class WebSocketsEchoHandler(tcp.BaseHandler): |