Response.protocol -> Response.http_version (#250)

* Response.protocol -> Response.http_version

* Update docs

diff --git a/docs/api.md b/docs/api.md
index f5286dd0f3aa13e99d0b76d55523cba309711d2a..5749b3ee4d0dc70572997e4c95bf8ce6635c1088 100644 (file)
--- a/docs/api.md
+++ b/docs/api.md
@@ -39,7 +39,7 @@
 * `def __init__(...)`
 * `.status_code` - **int**
 * `.reason_phrase` - **str**
-* `.protocol` - `"HTTP/2"` or `"HTTP/1.1"`
+* `.http_version` - `"HTTP/2"` or `"HTTP/1.1"`
 * `.url` - **URL**
 * `.headers` - **Headers**
 * `.content` - **bytes**

diff --git a/docs/index.md b/docs/index.md
index 40813c63b7efa5aa8826f278557954bbdfa7953e..06a96f60f26b2af51bb83be8fcb968b5c381c154 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -39,7 +39,7 @@ Let's get started...
 <Response [200 OK]>
 >>> r.status_code
 200
->>> r.protocol
+>>> r.http_version
 'HTTP/2'
 >>> r.headers['content-type']
 'text/html; charset=UTF-8'

diff --git a/httpx/client.py b/httpx/client.py
index ae75f15da8b061512fec00985b6cc89c91351524..feeaee091c42f5a0e5508406dcaeb4bb616eff8f 100644 (file)
--- a/httpx/client.py
+++ b/httpx/client.py
@@ -719,7 +719,7 @@ class Client(BaseClient):
 
         response = Response(
             status_code=async_response.status_code,
-            protocol=async_response.protocol,
+            http_version=async_response.http_version,
             headers=async_response.headers,
             content=sync_content,
             on_close=sync_on_close,

diff --git a/httpx/dispatch/asgi.py b/httpx/dispatch/asgi.py
index e3b4b0a0dfb4f9973f35891ba881699fc3f2a93f..01313fedf4a2116537c7ca525093c1342fc04b8c 100644 (file)
--- a/httpx/dispatch/asgi.py
+++ b/httpx/dispatch/asgi.py
@@ -142,7 +142,7 @@ class ASGIDispatch(AsyncDispatcher):
 
         return AsyncResponse(
             status_code=status_code,
-            protocol="HTTP/1.1",
+            http_version="HTTP/1.1",
             headers=headers,
             content=response_body.iterate(),
             on_close=on_close,

diff --git a/httpx/dispatch/http11.py b/httpx/dispatch/http11.py
index eff419a1cba7cc84652c477ef209359bd0e4760e..46d7309cc393fa8c6a7437e56634765e60204a18 100644 (file)
--- a/httpx/dispatch/http11.py
+++ b/httpx/dispatch/http11.py
@@ -54,7 +54,7 @@ class HTTP11Connection:
 
         return AsyncResponse(
             status_code=status_code,
-            protocol=http_version,
+            http_version=http_version,
             headers=headers,
             content=content,
             on_close=self.response_closed,

diff --git a/httpx/dispatch/http2.py b/httpx/dispatch/http2.py
index f932598236b149e59be2a3d0904a138f499d0f3c..199ee8fa198d666a9dacef1aa6c6c452ebd4b8b4 100644 (file)
--- a/httpx/dispatch/http2.py
+++ b/httpx/dispatch/http2.py
@@ -51,7 +51,7 @@ class HTTP2Connection:
 
         return AsyncResponse(
             status_code=status_code,
-            protocol="HTTP/2",
+            http_version="HTTP/2",
             headers=headers,
             content=content,
             on_close=on_close,

diff --git a/httpx/dispatch/threaded.py b/httpx/dispatch/threaded.py
index e4fdfd5ed152dcf1e2a98f6d4b75caff2f23733e..602001092d8ea90af52d21a15bdd1a864abfd751 100644 (file)
--- a/httpx/dispatch/threaded.py
+++ b/httpx/dispatch/threaded.py
@@ -64,7 +64,7 @@ class ThreadedDispatcher(AsyncDispatcher):
 
         return AsyncResponse(
             status_code=sync_response.status_code,
-            protocol=sync_response.protocol,
+            http_version=sync_response.http_version,
             headers=sync_response.headers,
             content=async_content,
             on_close=async_on_close,

diff --git a/httpx/dispatch/wsgi.py b/httpx/dispatch/wsgi.py
index 60e0a18c7942030a3dcaf19b690767c139450123..e1109c05a39fcfed2a8cc39fb6340e777ece9c4f 100644 (file)
--- a/httpx/dispatch/wsgi.py
+++ b/httpx/dispatch/wsgi.py
@@ -104,7 +104,7 @@ class WSGIDispatch(Dispatcher):
 
         return Response(
             status_code=int(seen_status.split()[0]),
-            protocol="HTTP/1.1",
+            http_version="HTTP/1.1",
             headers=seen_response_headers,
             content=(chunk for chunk in result),
             on_close=getattr(result, "close", None),

diff --git a/httpx/models.py b/httpx/models.py
index edb5723f81f0e3279339615a06cd08d65aa657fa..4016f89a9f1c53f9eab8bb96ac011e790c2f87bc 100644 (file)
--- a/httpx/models.py
+++ b/httpx/models.py
@@ -688,13 +688,13 @@ class BaseResponse:
         self,
         status_code: int,
         *,
-        protocol: str = None,
+        http_version: str = None,
         headers: HeaderTypes = None,
         request: BaseRequest = None,
         on_close: typing.Callable = None,
     ):
         self.status_code = status_code
-        self.protocol = protocol
+        self.http_version = http_version
         self.headers = Headers(headers)
 
         self.request = request
@@ -870,7 +870,7 @@ class AsyncResponse(BaseResponse):
         self,
         status_code: int,
         *,
-        protocol: str = None,
+        http_version: str = None,
         headers: HeaderTypes = None,
         content: AsyncResponseContent = None,
         on_close: typing.Callable = None,
@@ -879,7 +879,7 @@ class AsyncResponse(BaseResponse):
     ):
         super().__init__(
             status_code=status_code,
-            protocol=protocol,
+            http_version=http_version,
             headers=headers,
             request=request,
             on_close=on_close,
@@ -960,7 +960,7 @@ class Response(BaseResponse):
         self,
         status_code: int,
         *,
-        protocol: str = None,
+        http_version: str = None,
         headers: HeaderTypes = None,
         content: ResponseContent = None,
         on_close: typing.Callable = None,
@@ -969,7 +969,7 @@ class Response(BaseResponse):
     ):
         super().__init__(
             status_code=status_code,
-            protocol=protocol,
+            http_version=http_version,
             headers=headers,
             request=request,
             on_close=on_close,

diff --git a/tests/client/test_async_client.py b/tests/client/test_async_client.py
index b037085f25fc38629c3ea1b8b808890f941b7bce..e4e62747a366d5c58541c51c1c6aa038f5fab055 100644 (file)
--- a/tests/client/test_async_client.py
+++ b/tests/client/test_async_client.py
@@ -10,7 +10,7 @@ async def test_get(server):
         response = await client.get(url)
     assert response.status_code == 200
     assert response.text == "Hello, world!"
-    assert response.protocol == "HTTP/1.1"
+    assert response.http_version == "HTTP/1.1"
     assert response.headers
     assert repr(response) == "<Response [200 OK]>"
 

diff --git a/tests/client/test_client.py b/tests/client/test_client.py
index 6ae4633a349e0503bdd0a1347aac01a7250b912a..293d216360eaf9662613c9b1da0a38f006298ab0 100644 (file)
--- a/tests/client/test_client.py
+++ b/tests/client/test_client.py
@@ -32,7 +32,7 @@ def test_get(server):
     assert response.url == httpx.URL(url)
     assert response.content == b"Hello, world!"
     assert response.text == "Hello, world!"
-    assert response.protocol == "HTTP/1.1"
+    assert response.http_version == "HTTP/1.1"
     assert response.encoding == "iso-8859-1"
     assert response.request.url == httpx.URL(url)
     assert response.headers