From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 23 Feb 2013 03:59:37 +0000 (+0200)
Subject: #17249: merge with 3.3.
X-Git-Tag: v3.4.0a1~1338
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a909368b99b736c98b9c4751889029743ee3467;p=thirdparty%2FPython%2Fcpython.git

#17249: merge with 3.3.
---

8a909368b99b736c98b9c4751889029743ee3467
diff --cc Misc/NEWS
index c91c3dd4a1ed,a184bfcb3011..07c86db10f7e
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -857,10 -620,8 +857,12 @@@ Extension Module
  Tests
  -----
  
+ - Issue #17249: convert a test in test_capi to use unittest and reap threads.
+ 
 +- Issue #17107: Test client-side SNI support in urllib.request thanks to
 +  the new server-side SNI support in the ssl module.  Initial patch by
 +  Daniel Black.
 +
  - Issue #17041: Fix testing when Python is configured with the
    --without-doc-strings.