aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tutils.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-01 11:12:10 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-01 11:12:10 +1200
commit44fdcb4b8291a5be6738f32d6fde307af3f2034e (patch)
tree64a4a2cfa6295d0a367d5484a0d86bc5e22ab779 /netlib/tutils.py
parentbe644453649f0b0cf84822ad9de566b7dc744873 (diff)
downloadmitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.tar.gz
mitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.tar.bz2
mitmproxy-44fdcb4b8291a5be6738f32d6fde307af3f2034e.zip
Reorganise netlib imports according to Google Style Guide
Diffstat (limited to 'netlib/tutils.py')
-rw-r--r--netlib/tutils.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/netlib/tutils.py b/netlib/tutils.py
index e44534ec..452766d6 100644
--- a/netlib/tutils.py
+++ b/netlib/tutils.py
@@ -7,8 +7,7 @@ from contextlib import contextmanager
import six
import sys
-from . import utils, tcp
-from .http import Request, Response, Headers
+from netlib import utils, tcp, http
def treader(bytes):
@@ -107,11 +106,11 @@ def treq(**kwargs):
port=22,
path=b"/path",
http_version=b"HTTP/1.1",
- headers=Headers(((b"header", b"qvalue"), (b"content-length", b"7"))),
+ headers=http.Headers(((b"header", b"qvalue"), (b"content-length", b"7"))),
content=b"content"
)
default.update(kwargs)
- return Request(**default)
+ return http.Request(**default)
def tresp(**kwargs):
@@ -123,10 +122,10 @@ def tresp(**kwargs):
http_version=b"HTTP/1.1",
status_code=200,
reason=b"OK",
- headers=Headers(((b"header-response", b"svalue"), (b"content-length", b"7"))),
+ headers=http.Headers(((b"header-response", b"svalue"), (b"content-length", b"7"))),
content=b"message",
timestamp_start=time.time(),
timestamp_end=time.time(),
)
default.update(kwargs)
- return Response(**default)
+ return http.Response(**default)