]> granicus.if.org Git - python/commitdiff
Merge from 3.5.
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 7 Dec 2016 11:31:47 +0000 (13:31 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 7 Dec 2016 11:31:47 +0000 (13:31 +0200)
1  2 
Lib/_pyio.py
Modules/_io/_iomodule.c

diff --cc Lib/_pyio.py
Simple merge
Simple merge