[Python-checkins] bpo-33365: print the header values beside the keys (GH-6611)

Tue Jun 19 09:52:41 EDT 2018

https://github.com/python/cpython/commit/2edcf0a3db608457f42f4e4b74aff28237b4c91b
commit: 2edcf0a3db608457f42f4e4b74aff28237b4c91b
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年06月19日T06:52:36-07:00
summary:
bpo-33365: print the header values beside the keys (GH-6611)
with debuglevel=1 only the header keys got printed. With
this change the header values get printed as well and the single
header entries get '\n' as a separator.
(cherry picked from commit 936f03e7fafc28fd6fdfba11d162c776b89c0167)
Co-authored-by: Marco Strigl <mstrigl at suse.com>
files:
A Misc/NEWS.d/next/Library/2018-05-08-15-01-10.bpo-33365.SicsAd.rst
M Lib/http/client.py
M Lib/test/test_httplib.py

diff --git a/Lib/http/client.py b/Lib/http/client.py
index 1292db74784c..5aa178d7b127 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -321,7 +321,7 @@ def begin(self):
 
 if self.debuglevel > 0:
 for hdr in self.headers:
- print("header:", hdr, end=" ")
+ print("header:", hdr + ":", self.headers.get(hdr))
 
 # are we using the chunked-style of transfer encoding?
 tr_enc = self.headers.get("transfer-encoding")
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index a3f8194dc44f..f816eac83b68 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -344,6 +344,21 @@ def test_invalid_headers(self):
 with self.assertRaisesRegex(ValueError, 'Invalid header'):
 conn.putheader(name, value)
 
+ def test_headers_debuglevel(self):
+ body = (
+ b'HTTP/1.1 200 OK\r\n'
+ b'First: val\r\n'
+ b'Second: val\r\n'
+ )
+ sock = FakeSocket(body)
+ resp = client.HTTPResponse(sock, debuglevel=1)
+ with support.captured_stdout() as output:
+ resp.begin()
+ lines = output.getvalue().splitlines()
+ self.assertEqual(lines[0], "reply: 'HTTP/1.1 200 OK\\r\\n'")
+ self.assertEqual(lines[1], "header: First: val")
+ self.assertEqual(lines[2], "header: Second: val")
+
 
 class TransferEncodingTest(TestCase):
 expected_body = b"It's just a flesh wound"
diff --git a/Misc/NEWS.d/next/Library/2018-05-08-15-01-10.bpo-33365.SicsAd.rst b/Misc/NEWS.d/next/Library/2018-05-08-15-01-10.bpo-33365.SicsAd.rst
new file mode 100644
index 000000000000..41c273f37998
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-05-08-15-01-10.bpo-33365.SicsAd.rst
@@ -0,0 +1 @@
+Print the header values besides the header keys instead just the header keys if *debuglevel* is set to >0 in :mod:`http.client`. Patch by Marco Strigl.
