From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 2 Mar 2013 12:48:01 +0000 (+0200)
Subject: #17334: merge with 3.3.
X-Git-Tag: v3.4.0a1~1289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee71f4a8a435eadef176b9a651d5245d7be03e51;p=python

#17334: merge with 3.3.
---

ee71f4a8a435eadef176b9a651d5245d7be03e51
diff --cc Misc/NEWS
index eac45d309d,983c1cccbb..a8392d5ad0
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -897,8 -644,9 +897,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 #17334: test_index now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17333: test_imaplib now works with unittest test discovery.
    Patch by Zachary Ware.