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

#16910: merge with 3.3.
---

5b1acc0dff9b242cc6e5f7c7aa1a19f361f98004
diff --cc Misc/NEWS
index 76ae11ea50b8,0c1be4610dfc..926a15b0e336
--- 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 #16910: test_bytes, test_unicode, and test_userstring now work with
+   unittest test discovery.  Patch by Zachary Ware.
+ 
  - Issue #16905: test_warnings now works with unittest test discovery.
    Initial patch by Berker Peksag.