From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Jan 2013 02:33:17 +0000 (+0200)
Subject: #16897: merge with 3.3.
X-Git-Tag: v3.4.0a1~1667
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e97071fe0d3c3afe791148f7ddc884855db3762;p=python

#16897: merge with 3.3.
---

9e97071fe0d3c3afe791148f7ddc884855db3762
diff --cc Misc/NEWS
index 8e49199bdc,e9c7d9e86c..7b85b1b05e
--- 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 #16897: test_bisect now works with unittest test discovery.
+   Initial patch by Zachary Ware.
+ 
  - Issue #16852: test_genericpath, test_posixpath, test_ntpath, and test_macpath
    now work with unittest test discovery.  Patch by Zachary Ware.