#16896: merge with 3.3.

diff --cc Lib/test/test_asyncore.py
Simple merge

diff --cc Misc/NEWS
index 7b85b1b05e022c1ca3637850b3aec8289d2a2487,69b36365592c074a931fda1301e3f77ac1921678..84a7809bfa37b7518e8b9a367e07eb245b90bde4
--- 1/Misc/NEWS
--- 2/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.