From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 27 Feb 2013 08:01:06 +0000 (+0200)
Subject: #17303: merge with 3.3.
X-Git-Tag: v3.4.0a1~1309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28050255cca492295df75b9649dddd4d95a0940c;p=thirdparty%2FPython%2Fcpython.git

#17303: merge with 3.3.
---

28050255cca492295df75b9649dddd4d95a0940c
diff --cc Misc/NEWS
index 8917b53a2a69,ef295b756e6a..60dda936abcf
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -891,8 -644,9 +891,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 #17303: test_future* now work with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17163: test_file now works with unittest test discovery.
    Patch by Zachary Ware.