From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 1 Mar 2013 08:56:35 +0000 (+0200)
Subject: #17079: merge with 3.3.
X-Git-Tag: v3.4.0a1~1301
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cc46d35f1335e513238ba831df9d82ddc81b9d9;p=python

#17079: merge with 3.3.
---

6cc46d35f1335e513238ba831df9d82ddc81b9d9
diff --cc Misc/NEWS
index 9e284515a6,3149f90852..1c5f3b395b
--- 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 #17079: test_ctypes now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17304: test_hash now works with unittest test discovery.
    Patch by Zachary Ware.