Tidy up

Author: lovelydinosaur

src/ahttpx/_network.py

@@ -3,9 +3,10 @@
 import types
 import typing
 
+import certifi
+
 from ._streams import Stream
 
-import certifi
 
 __all__ = ["NetworkBackend", "NetworkStream", "timeout"]
 

src/ahttpx/_parsers.py

@@ -350,7 +350,7 @@ def __repr__(self) -> str:
         return f'<HTTPParser [{detail}]>'
 
 
-class ReadAheadParser(Stream):
+class ReadAheadParser:
     """
     A buffered I/O stream, with methods for read-ahead parsing.
     """
@@ -369,7 +369,7 @@ def _push_back(self, buffer):
         assert self._buffer == b''
         self._buffer = buffer
 
-    async def read(self, size: int=-1) -> bytes:
+    async def read(self, size: int) -> bytes:
         """
         Read and return up to 'size' bytes from the stream, with I/O buffering provided.
 

src/httpx/_network.py

@@ -9,15 +9,15 @@
 import types
 import typing
 
-from ._streams import Stream
-
 import certifi
 
+from ._streams import Stream
 
-_timeout_stack: contextvars.ContextVar[list[float]] = contextvars.ContextVar("timeout_context", default=[])
 
 __all__ = ["NetworkBackend", "NetworkStream", "timeout"]
 
+_timeout_stack: contextvars.ContextVar[list[float]] = contextvars.ContextVar("timeout_context", default=[])
+
 
 @contextlib.contextmanager
 def timeout(duration: float) -> typing.Iterator[None]:
@@ -82,10 +82,8 @@ def write(self, buffer: bytes) -> None:
 
     def close(self) -> None:
         if not self._is_closed:
-            timeout = get_current_timeout()
-            self._socket.settimeout(timeout)
-            self._socket.close()
             self._is_closed = True
+            self._socket.close()
 
     def __repr__(self):
         description = ""
@@ -96,7 +94,7 @@ def __repr__(self):
     def __del__(self):
         if not self._is_closed:
             import warnings
-            warnings.warn("NetworkStream was garbage collected without being closed.")
+            warnings.warn(f"NetworkStream was garbage collected without being closed.")
 
     def __enter__(self) -> "NetworkStream":
         return self

src/httpx/_parsers.py

@@ -350,7 +350,7 @@ def __repr__(self) -> str:
         return f'<HTTPParser [{detail}]>'
 
 
-class ReadAheadParser(Stream):
+class ReadAheadParser:
     """
     A buffered I/O stream, with methods for read-ahead parsing.
     """
@@ -369,7 +369,7 @@ def _push_back(self, buffer):
         assert self._buffer == b''
         self._buffer = buffer
 
-    def read(self, size: int=-1) -> bytes:
+    def read(self, size: int) -> bytes:
         """
         Read and return up to 'size' bytes from the stream, with I/O buffering provided.