aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-21 00:44:17 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-21 00:44:17 +0200
commit73586b1be95d97f0be76e85223b53d1f4ed697d6 (patch)
tree47754fc26d196355babbff026df035271953c5d0 /netlib/tutils.py
parentdaebd1bd275a398d42cc4dbfe5c6399c7fe3b3a0 (diff)
downloadmitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.tar.gz
mitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.tar.bz2
mitmproxy-73586b1be95d97f0be76e85223b53d1f4ed697d6.zip
python 3++
Diffstat (limited to 'netlib/tutils.py')
-rw-r--r--netlib/tutils.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/netlib/tutils.py b/netlib/tutils.py
index 4903d63b..1665a792 100644
--- a/netlib/tutils.py
+++ b/netlib/tutils.py
@@ -7,7 +7,7 @@ from contextlib import contextmanager
import six
import sys
-from . import utils
+from . import utils, tcp
from .http import Request, Response, Headers
@@ -15,7 +15,6 @@ def treader(bytes):
"""
Construct a tcp.Read object from bytes.
"""
- from . import tcp # TODO: move to top once cryptography is on Python 3.5
fp = BytesIO(bytes)
return tcp.Reader(fp)
@@ -106,7 +105,7 @@ def treq(**kwargs):
port=22,
path=b"/path",
http_version=b"HTTP/1.1",
- headers=Headers(header=b"qvalue"),
+ headers=Headers(header="qvalue"),
body=b"content"
)
default.update(kwargs)