#17333: merge with 3.3.

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

diff --cc Misc/NEWS
index 82030c98e77841881de42c5afecbf7aab8d70b33,83c38ec92a927efc142d5178cdea3922e10e9525..eac45d309d6a7cb44f4dd21bb680377da13fd7ec
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -897,8 -644,9 +897,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 #17333: test_imaplib now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17082: test_dbm* now work with unittest test discovery.
    Patch by Zachary Ware.