Pull out chunked logic from read()

Author: Lukasa

hyper/http11/response.py

@@ -94,31 +94,8 @@ def read(self, amt=None, decode_content=True):
             return b''
 
         if self._chunked:
-            # If we're doing a full read, read it as chunked and then just join
-            # the chunks together!
-            if amt is None:
-                return self._buffered_data + b''.join(self.read_chunked())
-
-            if self._chunker is None:
-                self._chunker = self.read_chunked()
-
-            # Otherwise, we have a certain amount of data we want to read.
-            current_amount = len(self._buffered_data)
-
-            extra_data = [self._buffered_data]
-            while current_amount < amt:
-                try:
-                    chunk = next(self._chunker)
-                except StopIteration:
-                    self.close()
-                    break
-
-                current_amount += len(chunk)
-                extra_data.append(chunk)
+            return self._normal_read_chunked(amt, decode_content)
 
-            data = b''.join(extra_data)
-            self._buffered_data = data[amt:]
-            return data[:amt]
 
         # If we're asked to do a read without a length, we need to read
         # everything. That means either the entire content length, or until the
@@ -273,6 +250,36 @@ def _read_expect_closed(self, decode_content):
 
         return data
 
+    def _normal_read_chunked(self, amt, decode_content):
+        """
+        Implements the logic for calling ``read()`` on a chunked response.
+        """
+        # If we're doing a full read, read it as chunked and then just join
+        # the chunks together!
+        if amt is None:
+            return self._buffered_data + b''.join(self.read_chunked())
+
+        if self._chunker is None:
+            self._chunker = self.read_chunked()
+
+        # Otherwise, we have a certain amount of data we want to read.
+        current_amount = len(self._buffered_data)
+
+        extra_data = [self._buffered_data]
+        while current_amount < amt:
+            try:
+                chunk = next(self._chunker)
+            except StopIteration:
+                self.close()
+                break
+
+            current_amount += len(chunk)
+            extra_data.append(chunk)
+
+        data = b''.join(extra_data)
+        self._buffered_data = data[amt:]
+        return data[:amt]
+
     # The following methods implement the context manager protocol.
     def __enter__(self):
         return self