adjust to netlib response changes + docs

4 files changed, 11 insertions, 11 deletions

diff --git a/test/test_dump.py b/test/test_dump.py
index 9586a304..a903a651 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -38,13 +38,13 @@ def test_strfuncs():
     flow.request.stickycookie = True
     flow.client_conn = mock.MagicMock()
     flow.client_conn.address.host = "foo"
-    flow.response = netlib.tutils.tresp(body=CONTENT_MISSING)
+    flow.response = netlib.tutils.tresp(content=CONTENT_MISSING)
     flow.response.is_replay = True
     flow.response.status_code = 300
     m.echo_flow(flow)
 
 
-    flow = tutils.tflow(resp=netlib.tutils.tresp(body="{"))
+    flow = tutils.tflow(resp=netlib.tutils.tresp(content="{"))
     flow.response.headers["content-type"] = "application/json"
     flow.response.status_code = 400
     m.echo_flow(flow)
@@ -69,7 +69,7 @@ class TestDumpMaster:
         m.handle_clientconnect(f.client_conn)
         m.handle_serverconnect(f.server_conn)
         m.handle_request(f)
-        f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=content))
+        f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=content))
         f = m.handle_response(f)
         m.handle_clientdisconnect(f.client_conn)
         return f
diff --git a/test/test_flow.py b/test/test_flow.py
index 0cd45576..ca862bda 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -8,8 +8,8 @@ import mock
 
 import netlib.utils
 from netlib import odict
-from netlib.http import CONTENT_MISSING, HDR_FORM_URLENCODED, Headers
-from libmproxy import filt, protocol, controller, tnetstring, flow
+from netlib.http import CONTENT_MISSING, Headers
+from libmproxy import filt, controller, tnetstring, flow
 from libmproxy.models import Error, Flow, HTTPRequest, HTTPResponse, HTTPFlow, decoded
 from libmproxy.proxy.config import HostMatcher
 from libmproxy.proxy import ProxyConfig
@@ -849,7 +849,7 @@ class TestFlowMaster:
         s = flow.State()
 
         f = tutils.tflow()
-        f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=f.request))
+        f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=f.request))
         pb = [f]
 
         fm = flow.FlowMaster(None, s)
@@ -903,7 +903,7 @@ class TestFlowMaster:
     def test_server_playback_kill(self):
         s = flow.State()
         f = tutils.tflow()
-        f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=f.request))
+        f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=f.request))
         pb = [f]
         fm = flow.FlowMaster(None, s)
         fm.refresh_server_playback = True
@@ -1044,7 +1044,7 @@ class TestRequest:
     def test_getset_form_urlencoded(self):
         d = odict.ODict([("one", "two"), ("three", "four")])
         r = HTTPRequest.wrap(netlib.tutils.treq(content=netlib.utils.urlencode(d.lst)))
-        r.headers["content-type"] = HDR_FORM_URLENCODED
+        r.headers["content-type"] = "application/x-www-form-urlencoded"
         assert r.get_form_urlencoded() == d
 
         d = odict.ODict([("x", "y")])
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py
index 5ddb5b5b..4158adda 100644
--- a/test/test_protocol_http.py
+++ b/test/test_protocol_http.py
@@ -46,11 +46,11 @@ class TestInvalidRequests(tservers.HTTPProxTest):
         p = self.pathoc()
         r = p.request("connect:'%s:%s'" % ("127.0.0.1", self.server2.port))
         assert r.status_code == 400
-        assert "Invalid HTTP request form" in r.body
+        assert "Invalid HTTP request form" in r.content
 
     def test_relative_request(self):
         p = self.pathoc_raw()
         p.connect()
         r = p.request("get:/p/200")
         assert r.status_code == 400
-        assert "Invalid HTTP request form" in r.body
+        assert "Invalid HTTP request form" in r.content
diff --git a/test/test_server.py b/test/test_server.py
index 2a09d2e5..9488595f 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -616,7 +616,7 @@ class MasterRedirectRequest(tservers.TestMaster):
         super(MasterRedirectRequest, self).handle_request(f)
 
     def handle_response(self, f):
-        f.response.body = str(f.client_conn.address.port)
+        f.response.content = str(f.client_conn.address.port)
         f.response.headers["server-conn-id"] = str(f.server_conn.source_address.port)
         super(MasterRedirectRequest, self).handle_response(f)