From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 2 Mar 2013 12:33:05 +0000 (+0200)
Subject: #17333: merge with 3.3.
X-Git-Tag: v3.4.0a1~1290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c67e22145d55e10805a702c8ca0d72298b29b3d;p=thirdparty%2FPython%2Fcpython.git

#17333: merge with 3.3.
---

5c67e22145d55e10805a702c8ca0d72298b29b3d
diff --cc Misc/NEWS
index 82030c98e778,83c38ec92a92..eac45d309d6a
--- a/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.