From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 21 Oct 2016 00:52:04 +0000 (+0000)
Subject: Issue #23214: Remove BufferedReader.read1(-1) workaround
X-Git-Tag: v3.7.0a1~2181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=741d4940fed82b3d80f8948b99adc787b48549f4;p=thirdparty%2FPython%2Fcpython.git

Issue #23214: Remove BufferedReader.read1(-1) workaround
---

diff --git a/Lib/http/client.py b/Lib/http/client.py
index a8e59b95616b..59237a3b31a6 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -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: