From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 23 Mar 2013 14:36:58 +0000 (+0200)
Subject: #17479: merge with 3.3.
X-Git-Tag: v3.4.0a1~1106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e94cbd188b8e59fab69e5b6149563d131b50d0c1;p=thirdparty%2FPython%2Fcpython.git

#17479: merge with 3.3.
---

e94cbd188b8e59fab69e5b6149563d131b50d0c1
diff --cc Misc/NEWS
index 94843f039e52,9a0c9ddb53e1..aaeafc9f8639
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1033,8 -714,9 +1033,11 @@@ Test
  
  - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #17479: test_io now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17066: test_robotparser now works with unittest test discovery.
    Patch by Zachary Ware.