#17691: merge with 3.3.

diff --cc Misc/NEWS
index e0bd2093a25dcf9856aa5bfb3dd41797189ef3f4,5707f041c2e1152cbdbab0592597c8398cc77f8c..b337d4846783d835ca4d45eafb67f96f679633aa
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -379,6 -313,6 +379,9 @@@ Test
  - Issue #12820: add tests for the xml.dom.minicompat module.
    Patch by John Chandler and Phil Connell.
  
++- Issue #17691: test_univnewlines now works with unittest test discovery.
++  Patch by Zachary Ware.
++
  - Issue #17790: test_set now works with unittest test discovery.
    Patch by Zachary Ware.