requests: Shrink BodyStream by unifying read via readinto.

Signed-off-by: Pablo Ventura <pablogventura@gmail.com>

Author: pablogventura

python-ecosys/requests/requests/__init__.py

@@ -5,49 +5,40 @@ class BodyStream:
     def __init__(self, sock, remaining=0):
         self._sock = sock
         self._chunked = remaining < 0
-        self._remaining = -1 if remaining < 0 else remaining
+        self._remaining = remaining
 
     def read(self, n=-1):
-        if not self._chunked:
-            if self._remaining == 0:
-                return b""
-            if n < 0 or n > self._remaining:
-                n = self._remaining
-            data = self._sock.read(n)
-            self._remaining -= len(data)
-            if not data:
-                raise ValueError("Connection closed before body complete")
-            return data
         buf = bytearray(n if n >= 0 else 256)
+        if n >= 0:
+            got = self.readinto(buf)
+            return buf[:got] if got else b""
         result = b""
-        while True:
+        while 1:
             got = self.readinto(buf)
             if not got:
-                break
-            if n >= 0:
-                return buf[:got]
+                return result
             result += buf[:got]
-        return result
 
     def readinto(self, buf):
+        s = self._sock
         if self._remaining <= 0:
             if self._remaining == 0:
                 return 0
-            self._remaining = int(self._sock.readline().split(b";", 1)[0], 16)
+            self._remaining = int(s.readline().split(b";")[0], 16)
             if self._remaining == 0:
-                while True:
-                    l = self._sock.readline()
+                while 1:
+                    l = s.readline()
                     if not l or l == b"\r\n":
                         break
                 return 0
         if len(buf) > self._remaining:
             buf = memoryview(buf)[: self._remaining]
-        got = self._sock.readinto(buf)
+        got = s.readinto(buf)
         if not got:
             raise ValueError("Connection closed before body complete")
         self._remaining -= got
         if self._remaining == 0 and self._chunked:
-            self._sock.readline()
+            s.readline()
             self._remaining = -1
         return got