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

#16896: merge with 3.3.
---

af5b688f7149edd2d4aa6e8f5df149f24a5a083b
diff --cc Misc/NEWS
index 7b85b1b05e,69b3636559..84a7809bfa
--- 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 #16896: test_asyncore now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16897: test_bisect now works with unittest test discovery.
    Initial patch by Zachary Ware.