Merge 3.2

diff --cc Doc/library/logging.rst
Simple merge

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

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