]> granicus.if.org Git - python/commitdiff
Merge from 3.5.
authorSerhiy Storchaka <storchaka@gmail.com>
Sat, 8 Oct 2016 19:46:01 +0000 (22:46 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Sat, 8 Oct 2016 19:46:01 +0000 (22:46 +0300)
1  2 
Doc/c-api/unicode.rst
Lib/test/test_unicode.py
Misc/NEWS
Modules/_testcapimodule.c
Objects/unicodeobject.c

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