]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#8271: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 4 Nov 2012 21:23:09 +0000 (23:23 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 4 Nov 2012 21:23:09 +0000 (23:23 +0200)
1  2 
Lib/test/test_unicode.py
Misc/NEWS
Objects/stringlib/codecs.h
Objects/unicodeobject.c

Simple merge
diff --cc Misc/NEWS
Simple merge
Simple merge
Simple merge