#17066: merge with 3.3.

diff --cc Misc/NEWS
index 607ad5efd27ac60e8fa8b9acacb6b2f2760b00ad,fd10f5ced50d3635f5bfe56731b5f259ee082e86..b062c6ccdc5a3e570d4cecd517854a9c76545ad1
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -932,8 -662,9 +932,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 #17066: test_robotparser now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17334: test_index now works with unittest test discovery.
    Patch by Zachary Ware.