From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 03:20:01 +0000 (+0200)
Subject: #16919: merge with 3.3.
X-Git-Tag: v3.4.0a1~1654
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45d5de15008d53e4dd1018303f3e9ad56e43934f;p=thirdparty%2FPython%2Fcpython.git

#16919: merge with 3.3.
---

45d5de15008d53e4dd1018303f3e9ad56e43934f
diff --cc Misc/NEWS
index 5d49d0f56c84,7360af4436c1..bf6ab72c86c9
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -618,8 -421,9 +618,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16919: test_crypt now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16910: test_bytes, test_unicode, and test_userstring now work with
    unittest test discovery.  Patch by Zachary Ware.