Merge pull request #115 from Kriechi/move-tservers

move tservers to netlib module

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
 

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):

test/test_tcp.py

@@ -10,8 +10,7 @@ import mock
 from OpenSSL import SSL
 import OpenSSL
 
-from netlib import tcp, certutils, tutils
+from netlib import tcp, certutils, tutils, tservers
-from . import tservers
 from netlib.exceptions import InvalidCertificateException, TcpReadIncomplete, TlsException, \
     TcpTimeout, TcpDisconnect, TcpException
 

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):