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

[benjamin.peterson]

https://hg.python.org/cpython/rev/df8601299c94
changeset:   93878:df8601299c94
parent:      93876:ec96ffa6aa95
parent:      93877:2b4b475f2ed3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 13 16:13:31 2014 -0500
summary:
  merge 3.4

files:
  Lib/test/test_httplib.py |  1 +
  1 files changed, 1 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
@@ -1314,6 +1314,7 @@
         self.assertTrue(b'CONNECT destination.com' in conn.sock.data)
         self.assertTrue(b'Host: destination.com' in conn.sock.data)
 
+ at support.reap_threads
 def test_main(verbose=None):
     support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,
                          HTTPSTest, RequestBodyTest, SourceAddressTest,

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