Allow HTTPResponse.stream to use read1 when amt=None

urllib3 · Dec 4, 2023 · 24fb044 · 24fb044
1 parent 4ae4b71
commit 24fb044
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/urllib3/response.py b/src/urllib3/response.py
@@ -1024,9 +1024,14 @@ def stream(
                     data = self.read1(amt=amt, decode_content=decode_content)
                 else:
                     data = self.read(amt=amt, decode_content=decode_content)
-
                 if data:
                     yield data
+                else:
+                    if self._fp:
+                        self._fp.close()
+                    break
+        if self.length_remaining:
+            raise IncompleteRead(self._fp_bytes_read, self.length_remaining)
 
     # Overrides from io.IOBase
     def readable(self) -> bool:

diff --git a/test/test_response.py b/test/test_response.py
@@ -1036,10 +1036,11 @@ def read1(self, amt: int | None = None) -> bytes:
                 try:
                     return next(self.chunkiter)
                 except StopIteration:
-                    # http.client automatically closes at stream end
-                    self.closed = True
                     return b""
 
+            def close(self) -> None:
+                self.closed = True
+
         chunks = b"foo longer bar".split()
         fp = MockHTTPRequest(iter(chunks))
         resp = HTTPResponse(fp, preload_content=False)  # type: ignore[arg-type]