]> granicus.if.org Git - python/commitdiff
Merge from 3.6.
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 7 Dec 2016 11:32:09 +0000 (13:32 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 7 Dec 2016 11:32:09 +0000 (13:32 +0200)
1  2 
Lib/_pyio.py

diff --cc Lib/_pyio.py
Simple merge