]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #23214: Remove BufferedReader.read1(-1) workaround
authorMartin Panter <vadmium+py@gmail.com>
Fri, 21 Oct 2016 00:52:04 +0000 (00:52 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Fri, 21 Oct 2016 00:52:04 +0000 (00:52 +0000)
Lib/http/client.py

index a8e59b95616b4ce3863a03b61d1d618749eb7146..59237a3b31a61a9bbc6aaae5a15789a4a51074ec 100644 (file)
@@ -642,14 +642,7 @@ class HTTPResponse(io.BufferedIOBase):
             return self._read1_chunked(n)
         if self.length is not None and (n < 0 or n > self.length):
             n = self.length
-        try:
-            result = self.fp.read1(n)
-        except ValueError:
-            if n >= 0:
-                raise
-            # some implementations, like BufferedReader, don't support -1
-            # Read an arbitrarily selected largeish chunk.
-            result = self.fp.read1(16*1024)
+        result = self.fp.read1(n)
         if not result and n:
             self._close_conn()
         elif self.length is not None: