From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 10 Jan 2013 04:12:43 +0000 (+0200)
Subject: #16898: merge with 3.3.
X-Git-Tag: v3.4.0a1~1664
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09a8e163daa5dacecfe8956409b0d26b5e691d30;p=python

#16898: merge with 3.3.
---

09a8e163daa5dacecfe8956409b0d26b5e691d30
diff --cc Misc/NEWS
index 09d7b4b563,f1e39aeb7e..4938a49276
--- 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 #16898: test_bufio now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16888: test_array now works with unittest test discovery.
    Patch by Zachary Ware.