request -> request_method

3 files changed, 15 insertions, 11 deletions

diff --git a/netlib/http/http1/protocol.py b/netlib/http/http1/protocol.py
index 107a48d1..6b4489fb 100644
--- a/netlib/http/http1/protocol.py
+++ b/netlib/http/http1/protocol.py
@@ -136,8 +136,8 @@ class HTTP1Protocol(semantics.ProtocolMixin):
 
     def read_response(
         self,
-        request,
-        body_size_limit,
+        request_method,
+        body_size_limit=None,
         include_body=True,
     ):
         """
@@ -175,7 +175,7 @@ class HTTP1Protocol(semantics.ProtocolMixin):
             body = self.read_http_body(
                 headers,
                 body_size_limit,
-                request.method,
+                request_method,
                 code,
                 False
             )
diff --git a/netlib/http/http2/protocol.py b/netlib/http/http2/protocol.py
index 1d6e0168..b6a147d4 100644
--- a/netlib/http/http2/protocol.py
+++ b/netlib/http/http2/protocol.py
@@ -68,6 +68,9 @@ class HTTP2Protocol(semantics.ProtocolMixin):
         body_size_limit=None,
         allow_empty=False,
     ):
+        if body_size_limit is not None:
+            raise NotImplementedError()
+
         self.perform_connection_preface()
 
         timestamp_start = time.time()
@@ -130,10 +133,14 @@ class HTTP2Protocol(semantics.ProtocolMixin):
 
     def read_response(
         self,
-        request='',
+        request_method='',
         body_size_limit=None,
         include_body=True,
+        stream_id=None,
     ):
+        if body_size_limit is not None:
+            raise NotImplementedError()
+
         self.perform_connection_preface()
 
         timestamp_start = time.time()
@@ -141,7 +148,7 @@ class HTTP2Protocol(semantics.ProtocolMixin):
             self.tcp_handler.rfile.reset_timestamps()
 
         stream_id, headers, body = self._receive_transmission(
-            stream_id=request.stream_id,
+            stream_id=stream_id,
             include_body=include_body,
         )
 
diff --git a/netlib/http/semantics.py b/netlib/http/semantics.py
index e388a344..2b960483 100644
--- a/netlib/http/semantics.py
+++ b/netlib/http/semantics.py
@@ -345,10 +345,9 @@ class EmptyRequest(Request):
         host="",
         port="",
         path="",
-        httpversion=None,
+        httpversion=(0, 0),
         headers=None,
-        body="",
-        stream_id=None
+        body=""
     ):
         super(EmptyRequest, self).__init__(
             form_in=form_in,
@@ -357,12 +356,10 @@ class EmptyRequest(Request):
             host=host,
             port=port,
             path=path,
-            httpversion=(httpversion or (0, 0)),
+            httpversion=httpversion,
             headers=(headers or odict.ODictCaseless()),
             body=body,
         )
-        if stream_id:
-            self.stream_id = stream_id
 
 
 class Response(object):