From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 04:05:51 +0000 (+0200)
Subject: #16918: merge with 3.3.
X-Git-Tag: v3.4.0a1~1653
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aabd0b0312d70c952effc9828dee72fd5b77bd50;p=thirdparty%2FPython%2Fcpython.git

#16918: merge with 3.3.
---

aabd0b0312d70c952effc9828dee72fd5b77bd50
diff --cc Misc/NEWS
index bf6ab72c86c9,c5e987187187..bb46fe1ba5b2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -618,8 -421,9 +618,11 @@@ Extension Module
  Tests
  -----
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #16918: test_codecs now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #16919: test_crypt now works with unittest test discovery.
    Patch by Zachary Ware.