diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-10-21 00:52:04 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-10-21 00:52:04 +0000 |
commit | 741d4940fed82b3d80f8948b99adc787b48549f4 (patch) | |
tree | 6c5bc2fad5904a101b1e02e6cd765f9da7cc6919 /Lib/http/client.py | |
parent | ccb2c0e31056de091abdd62fc07ca6e4bb052f24 (diff) | |
download | cpython-git-741d4940fed82b3d80f8948b99adc787b48549f4.tar.gz |
Issue #23214: Remove BufferedReader.read1(-1) workaround
Diffstat (limited to 'Lib/http/client.py')
-rw-r--r-- | Lib/http/client.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index a8e59b9561..59237a3b31 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: |