From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Sat, 9 Apr 2011 18:12:43 +0000 (+0200)
Subject: Merge with 3.2
X-Git-Tag: v3.3.0a1~2638
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2a290c329624a3c73203f0775882086f0853d8a;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2
---

b2a290c329624a3c73203f0775882086f0853d8a
diff --cc Misc/NEWS
index eb632a89d103,23026db2a87f..a29798520b44
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -403,21 -223,13 +403,24 @@@ Extension
  Tests
  -----
  
+ - Issue #11719: Fix message about unexpected test_msilib skip on non-Windows
+   platforms. Patch by Nadeem Vawda.
+ 
 +- Issue #11727: Add a --timeout option to regrtest: if a test takes more than
 +  TIMEOUT seconds, dumps the traceback of all threads and exits.
 +
  - Issue #11653: fix -W with -j in regrtest.
  
 +- The email test suite now lives in the Lib/test/test_email package.  The test
 +  harness code has also been modernized to allow use of new unittest features.
 +
 +- regrtest now discovers test packages as well as test modules.
 +
  - Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov.
  
 +- New test_crashers added to exercise the scripts in the Lib/test/crashers
 +  directory and confirm they fail as expected
 +
  - Issue #11578: added test for the timeit module.  Patch Michael Henry.
  
  - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea.