merge 3.4 (#22517)

diff --cc Lib/test/test_io.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/_io/bufferedio.c
Simple merge