Rename BaseSocketStream cases from connection.stream to connection.socket (#601)

diff --git a/httpx/dispatch/http11.py b/httpx/dispatch/http11.py
index bbe2ac3f9e87ad8de261c5193cc7a11b489307ad..44961f027f28f68052ee48e8a45d6bcc17446b68 100644 (file)
--- a/httpx/dispatch/http11.py
+++ b/httpx/dispatch/http11.py
@@ -32,10 +32,10 @@ class HTTP11Connection:
 
     def __init__(
         self,
-        stream: BaseSocketStream,
+        socket: BaseSocketStream,
         on_release: typing.Optional[OnReleaseCallback] = None,
     ):
-        self.stream = stream
+        self.socket = socket
         self.on_release = on_release
         self.h11_state = h11.Connection(our_role=h11.CLIENT)
         self.timeout_flag = TimeoutFlag()
@@ -65,7 +65,7 @@ class HTTP11Connection:
         except h11.LocalProtocolError:  # pragma: no cover
             # Premature client disconnect
             pass
-        await self.stream.close()
+        await self.socket.close()
 
     async def _send_request(self, request: Request, timeout: Timeout) -> None:
         """
@@ -112,7 +112,7 @@ class HTTP11Connection:
         drain before returning.
         """
         bytes_to_send = self.h11_state.send(event)
-        await self.stream.write(bytes_to_send, timeout)
+        await self.socket.write(bytes_to_send, timeout)
 
     async def _receive_response(
         self, timeout: Timeout
@@ -160,7 +160,7 @@ class HTTP11Connection:
                     + f"their_state={self.h11_state.their_state} "
                     + f"error_status_hint={e.error_status_hint}"
                 )
-                if self.stream.is_connection_dropped():
+                if self.socket.is_connection_dropped():
                     raise ConnectionClosed(e)
                 raise ProtocolError(e)
 
@@ -171,7 +171,7 @@ class HTTP11Connection:
 
             if event is h11.NEED_DATA:
                 try:
-                    data = await self.stream.read(
+                    data = await self.socket.read(
                         self.READ_NUM_BYTES, timeout, flag=self.timeout_flag
                     )
                 except OSError:  # pragma: nocover
@@ -206,4 +206,4 @@ class HTTP11Connection:
         return self.h11_state.our_state in (h11.CLOSED, h11.ERROR)
 
     def is_connection_dropped(self) -> bool:
-        return self.stream.is_connection_dropped()
+        return self.socket.is_connection_dropped()

diff --git a/httpx/dispatch/http2.py b/httpx/dispatch/http2.py
index e664692476c8a998b82661dbe6c1a53d100a2cf3..09368c884e1bb459c3e8a098ee3bfc81336bbfa5 100644 (file)
--- a/httpx/dispatch/http2.py
+++ b/httpx/dispatch/http2.py
@@ -25,11 +25,11 @@ class HTTP2Connection:
 
     def __init__(
         self,
-        stream: BaseSocketStream,
+        socket: BaseSocketStream,
         backend: typing.Union[str, ConcurrencyBackend] = "auto",
         on_release: typing.Callable = None,
     ):
-        self.stream = stream
+        self.socket = socket
         self.backend = lookup_backend(backend)
         self.on_release = on_release
         self.h2_state = h2.connection.H2Connection()
@@ -81,7 +81,7 @@ class HTTP2Connection:
         )
 
     async def close(self) -> None:
-        await self.stream.close()
+        await self.socket.close()
 
     async def send_connection_init(self, timeout: Timeout) -> None:
         # Need to set these manually here instead of manipulating via
@@ -108,7 +108,7 @@ class HTTP2Connection:
 
         self.h2_state.initiate_connection()
         data_to_send = self.h2_state.data_to_send()
-        await self.stream.write(data_to_send, timeout)
+        await self.socket.write(data_to_send, timeout)
 
     async def send_headers(self, request: Request, timeout: Timeout) -> int:
         stream_id = self.h2_state.get_next_available_stream_id()
@@ -128,7 +128,7 @@ class HTTP2Connection:
         )
         self.h2_state.send_headers(stream_id, headers)
         data_to_send = self.h2_state.data_to_send()
-        await self.stream.write(data_to_send, timeout)
+        await self.socket.write(data_to_send, timeout)
         return stream_id
 
     async def send_request_data(
@@ -163,13 +163,13 @@ class HTTP2Connection:
                 chunk, data = data[:chunk_size], data[chunk_size:]
                 self.h2_state.send_data(stream_id, chunk)
                 data_to_send = self.h2_state.data_to_send()
-                await self.stream.write(data_to_send, timeout)
+                await self.socket.write(data_to_send, timeout)
 
     async def end_stream(self, stream_id: int, timeout: Timeout) -> None:
         logger.trace(f"end_stream stream_id={stream_id}")
         self.h2_state.end_stream(stream_id)
         data_to_send = self.h2_state.data_to_send()
-        await self.stream.write(data_to_send, timeout)
+        await self.socket.write(data_to_send, timeout)
 
     async def receive_response(
         self, stream_id: int, timeout: Timeout
@@ -211,7 +211,7 @@ class HTTP2Connection:
     async def receive_event(self, stream_id: int, timeout: Timeout) -> h2.events.Event:
         while not self.events[stream_id]:
             flag = self.timeout_flags[stream_id]
-            data = await self.stream.read(self.READ_NUM_BYTES, timeout, flag=flag)
+            data = await self.socket.read(self.READ_NUM_BYTES, timeout, flag=flag)
             events = self.h2_state.receive_data(data)
             for event in events:
                 event_stream_id = getattr(event, "stream_id", 0)
@@ -239,7 +239,7 @@ class HTTP2Connection:
                     self.events[event.stream_id].append(event)
 
             data_to_send = self.h2_state.data_to_send()
-            await self.stream.write(data_to_send, timeout)
+            await self.socket.write(data_to_send, timeout)
 
         return self.events[stream_id].pop(0)
 
@@ -256,4 +256,4 @@ class HTTP2Connection:
         return False
 
     def is_connection_dropped(self) -> bool:
-        return self.stream.is_connection_dropped()
+        return self.socket.is_connection_dropped()

diff --git a/httpx/dispatch/proxy_http.py b/httpx/dispatch/proxy_http.py
index 55577e38ee4f6542b357246ac5cd696aba87b6a4..aec042aa6e7b53d710114a2eae188422beef887a 100644 (file)
--- a/httpx/dispatch/proxy_http.py
+++ b/httpx/dispatch/proxy_http.py
@@ -175,7 +175,7 @@ class HTTPProxy(ConnectionPool):
         assert http_connection is not None
         assert http_connection.h11_state.our_state == h11.SWITCHED_PROTOCOL
         on_release = http_connection.on_release
-        stream = http_connection.stream
+        socket = http_connection.socket
 
         # If we need to start TLS again for the target server
         # we need to pull the socket stream off the internal
@@ -190,10 +190,10 @@ class HTTPProxy(ConnectionPool):
                 f"proxy_url={self.proxy_url!r} "
                 f"origin={origin!r}"
             )
-            stream = await stream.start_tls(
+            socket = await socket.start_tls(
                 hostname=origin.host, ssl_context=ssl_context, timeout=timeout
             )
-            http_version = stream.get_http_version()
+            http_version = socket.get_http_version()
             logger.trace(
                 f"tunnel_tls_complete "
                 f"proxy_url={self.proxy_url!r} "
@@ -203,11 +203,11 @@ class HTTPProxy(ConnectionPool):
 
         if http_version == "HTTP/2":
             connection.h2_connection = HTTP2Connection(
-                stream, self.backend, on_release=on_release
+                socket, self.backend, on_release=on_release
             )
         else:
             assert http_version == "HTTP/1.1"
-            connection.h11_connection = HTTP11Connection(stream, on_release=on_release)
+            connection.h11_connection = HTTP11Connection(socket, on_release=on_release)
 
     def should_forward_origin(self, origin: Origin) -> bool:
         """Determines if the given origin should