From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 1 Mar 2013 09:24:42 +0000 (+0200)
Subject: #17082: merge with 3.3.
X-Git-Tag: v3.4.0a1~1300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0b64663d940d717c2b75f94c398956ffea3e6f4;p=python

#17082: merge with 3.3.
---

c0b64663d940d717c2b75f94c398956ffea3e6f4
diff --cc Misc/NEWS
index 1c5f3b395b,91c415344f..57470e55fc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -894,8 -644,9 +894,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 #17082: test_dbm* now work with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17079: test_ctypes now works with unittest test discovery.
    Patch by Zachary Ware.