[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (httplib)

[victor.stinner]

https://hg.python.org/cpython/rev/2701e36e692f
changeset:   94772:2701e36e692f
parent:      94770:344d57c521b9
parent:      94771:056d71d7bb28
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Feb 27 17:47:40 2015 +0100
summary:
  Merge 3.4 (httplib)

files:
  Lib/test/test_httplib.py |  3 +++
  Misc/ACKS                |  1 +
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1113,6 +1113,7 @@
                                        context=context)
             h.request('GET', '/')
             resp = h.getresponse()
+            h.close()
             self.assertIn('nginx', resp.getheader('server'))
 
     @support.system_must_validate_cert
@@ -1124,6 +1125,7 @@
             h.request('GET', '/')
             resp = h.getresponse()
             content_type = resp.getheader('content-type')
+            h.close()
             self.assertIn('text/html', content_type)
 
     def test_networked_good_cert(self):
@@ -1138,6 +1140,7 @@
             h.request('GET', '/')
             resp = h.getresponse()
             server_string = resp.getheader('server')
+            h.close()
             self.assertIn('nginx', server_string)
 
     def test_networked_bad_cert(self):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1270,6 +1270,7 @@
 Pete Shinners
 Michael Shiplett
 John W. Shipman
+Alex Shkop
 Joel Shprentz
 Yue Shuaijie
 Terrel Shumway

-- 
Repository URL: https://hg.python.org/cpython