From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Jan 2013 04:06:31 +0000 (+0200)
Subject: #16888: merge with 3.3.
X-Git-Tag: v3.4.0a1~1665
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1b0d3e1230be2a378cf947488696752896bea29;p=thirdparty%2FPython%2Fcpython.git

#16888: merge with 3.3.
---

e1b0d3e1230be2a378cf947488696752896bea29
diff --cc Misc/NEWS
index 84a7809bfa37,99cb90ddb084..09d7b4b5639a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -612,8 -408,9 +612,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16888: test_array now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16896: test_asyncore now works with unittest test discovery.
    Patch by Zachary Ware.