From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 04:32:06 +0000 (+0200)
Subject: #16925: merge with 3.3.
X-Git-Tag: v3.4.0a1~1652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2645936e278e0f034701db2c3378af1da589e628;p=thirdparty%2FPython%2Fcpython.git

#16925: merge with 3.3.
---

2645936e278e0f034701db2c3378af1da589e628
diff --cc Misc/NEWS
index bb46fe1ba5b2,1d12d263d039..3742d3f191a6
--- 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 #16925: test_configparser now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16918: test_codecs now works with unittest test discovery.
    Patch by Zachary Ware.