#16748: merge with 3.3.

diff --cc Misc/NEWS
index e0fd52d58798a2d267b21704ad014b2a6a003f35,fdc313914e394cf8170833561f327b2ff9d6c727..161d4fd3113ae739cc80997550f26d7937dfa8b1
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -571,11 -381,8 +571,13 @@@ Extension Module
  Tests
  -----
  
+ - Issue #16748: test_heapq now works with unittest test discovery.
+ 
 +- Issue #10646: Tests rearranged for os.samefile/samestat to check for not
 +  just symlinks but also hard links.
 +
 +- Issue #15302: Switch regrtest from using getopt to using argparse.
 +
  - Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize
    options.