From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Jan 2013 04:53:34 +0000 (+0200)
Subject: #16905: merge with 3.3.
X-Git-Tag: v3.4.0a1~1663
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47b988609f5669ed2788a3c5c6004b13a3c2cff0;p=thirdparty%2FPython%2Fcpython.git

#16905: merge with 3.3.
---

47b988609f5669ed2788a3c5c6004b13a3c2cff0
diff --cc Misc/NEWS
index 4938a4927694,a70acd940512..76ae11ea50b8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -612,8 -408,9 +612,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16905: test_warnings now works with unittest test discovery.
+   Initial patch by Berker Peksag.
+ 
  - Issue #16898: test_bufio now works with unittest test discovery.
    Patch by Zachary Ware.