Issue #16723: httplib.HTTPResponse no longer marked closed when the connection

serhiy-storchaka · serhiy-storchaka · commit b6c86fd87f93 · 2013-02-06T10:35:40.000+02:00
is automatically closed.
diff --git a/Lib/http/client.py b/Lib/http/client.py
@@ -332,7 +332,7 @@ def _read_status(self):
                 # empty version will cause next test to fail.
                 version = ""
         if not version.startswith("HTTP/"):
-            self.close()
+            self._close_conn()
             raise BadStatusLine(line)
 
         # The status code is a three-digit number
@@ -454,29 +454,33 @@ def _check_close(self):
         # otherwise, assume it will close
         return True
 
+    def _close_conn(self):
+        fp = self.fp
+        self.fp = None
+        fp.close()
+
     def close(self):
+        super().close() # set "closed" flag
         if self.fp:
-            self.fp.close()
-            self.fp = None
+            self._close_conn()
 
     # These implementations are for the benefit of io.BufferedReader.
 
     # XXX This class should probably be revised to act more like
     # the "raw stream" that BufferedReader expects.
 
-    @property
-    def closed(self):
-        return self.isclosed()
-
     def flush(self):
-        self.fp.flush()
+        super().flush()
+        if self.fp:
+            self.fp.flush()
 
     def readable(self):
         return True
 
     # End of "raw stream" methods
 
     def isclosed(self):
+        """True if the connection is closed."""
         # NOTE: it is possible that we will not ever call self.close(). This
         #       case occurs when will_close is TRUE, length is None, and we
         #       read up to the last byte, but NOT past it.
@@ -490,7 +494,7 @@ def read(self, amt=None):
             return b""
 
         if self._method == "HEAD":
-            self.close()
+            self._close_conn()
             return b""
 
         if amt is not None:
@@ -510,18 +514,18 @@ def read(self, amt=None):
                 try:
                     s = self._safe_read(self.length)
                 except IncompleteRead:
-                    self.close()
+                    self._close_conn()
                     raise
                 self.length = 0
-            self.close()        # we read everything
+            self._close_conn()        # we read everything
             return s
 
     def readinto(self, b):
         if self.fp is None:
             return 0
 
         if self._method == "HEAD":
-            self.close()
+            self._close_conn()
             return 0
 
         if self.chunked:
@@ -539,11 +543,11 @@ def readinto(self, b):
         if not n:
             # Ideally, we would raise IncompleteRead if the content-length
             # wasn't satisfied, but it might break compatibility.
-            self.close()
+            self._close_conn()
         elif self.length is not None:
             self.length -= n
             if not self.length:
-                self.close()
+                self._close_conn()
         return n
 
     def _read_next_chunk_size(self):
@@ -559,7 +563,7 @@ def _read_next_chunk_size(self):
         except ValueError:
             # close the connection as protocol synchronisation is
             # probably lost
-            self.close()
+            self._close_conn()
             raise
 
     def _read_and_discard_trailer(self):
@@ -597,7 +601,7 @@ def _readall_chunked(self):
         self._read_and_discard_trailer()
 
         # we read everything; close the "file"
-        self.close()
+        self._close_conn()
 
         return b''.join(value)
 
@@ -638,7 +642,7 @@ def _readinto_chunked(self, b):
         self._read_and_discard_trailer()
 
         # we read everything; close the "file"
-        self.close()
+        self._close_conn()
 
         return total_bytes
 
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
@@ -164,6 +164,9 @@ def test_status_lines(self):
         resp.begin()
         self.assertEqual(resp.read(), b"Text")
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
         body = "HTTP/1.1 400.100 Not Ok\r\n\r\nText"
         sock = FakeSocket(body)
@@ -185,6 +188,9 @@ def test_partial_reads(self):
         self.assertFalse(resp.isclosed())
         self.assertEqual(resp.read(2), b'xt')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_partial_readintos(self):
         # if we have a length, the system knows when to close itself
@@ -202,6 +208,9 @@ def test_partial_readintos(self):
         self.assertEqual(n, 2)
         self.assertEqual(bytes(b), b'xt')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_partial_reads_no_content_length(self):
         # when no length is present, the socket should be gracefully closed when
@@ -215,6 +224,9 @@ def test_partial_reads_no_content_length(self):
         self.assertEqual(resp.read(2), b'xt')
         self.assertEqual(resp.read(1), b'')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_partial_readintos_no_content_length(self):
         # when no length is present, the socket should be gracefully closed when
@@ -266,6 +278,9 @@ def test_partial_readintos_incomplete_body(self):
         n = resp.readinto(b)
         self.assertEqual(n, 0)
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_host_port(self):
         # Check invalid host_port
@@ -493,6 +508,9 @@ def test_chunked_head(self):
         self.assertEqual(resp.status, 200)
         self.assertEqual(resp.reason, 'OK')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_readinto_chunked_head(self):
         chunked_start = (
@@ -513,6 +531,9 @@ def test_readinto_chunked_head(self):
         self.assertEqual(resp.status, 200)
         self.assertEqual(resp.reason, 'OK')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
     def test_negative_content_length(self):
         sock = FakeSocket(
@@ -588,6 +609,9 @@ def test_early_eof(self):
         resp.begin()
         self.assertEqual(resp.read(), b'')
         self.assertTrue(resp.isclosed())
+        self.assertFalse(resp.closed)
+        resp.close()
+        self.assertTrue(resp.closed)
 
 class OfflineTest(TestCase):
     def test_responses(self):
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -163,6 +163,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #16723: httplib.HTTPResponse no longer marked closed when the connection
+  is automatically closed.
+
 - Issue #16948: Fix quoted printable body encoding for non-latin1 character
   sets in the email package.
 
