aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-28 13:53:59 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-28 13:53:59 +0200
commit67229fbdf7be2f3bb591a9da77f75c05ed0ab269 (patch)
treeaa94ff2eacbe2c5d46dbad3f41c9ca2eae849f73 /netlib/tutils.py
parent5261bcdf4b0976b8db3295292143282b34f10c51 (diff)
parent23d13e4c1282bc46c54222479c3b83032dad3335 (diff)
downloadmitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.gz
mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.bz2
mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.zip
Merge branch 'http-models'
Diffstat (limited to 'netlib/tutils.py')
-rw-r--r--netlib/tutils.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/netlib/tutils.py b/netlib/tutils.py
index 1665a792..e16f1a76 100644
--- a/netlib/tutils.py
+++ b/netlib/tutils.py
@@ -98,7 +98,7 @@ def treq(**kwargs):
netlib.http.Request
"""
default = dict(
- form_in="relative",
+ first_line_format="relative",
method=b"GET",
scheme=b"http",
host=b"address",
@@ -106,7 +106,7 @@ def treq(**kwargs):
path=b"/path",
http_version=b"HTTP/1.1",
headers=Headers(header="qvalue"),
- body=b"content"
+ content=b"content"
)
default.update(kwargs)
return Request(**default)
@@ -120,9 +120,9 @@ def tresp(**kwargs):
default = dict(
http_version=b"HTTP/1.1",
status_code=200,
- msg=b"OK",
- headers=Headers(header_response=b"svalue"),
- body=b"message",
+ reason=b"OK",
+ headers=Headers(header_response="svalue"),
+ content=b"message",
timestamp_start=time.time(),
timestamp_end=time.time(),
)