#11565: Merge with 3.2.

diff --cc Lib/doctest.py
Simple merge

diff --cc Lib/platform.py
Simple merge

diff --cc Lib/subprocess.py
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc Modules/_ctypes/_ctypes.c
Simple merge

diff --cc Modules/_pickle.c
Simple merge

diff --cc Modules/socketmodule.c
Simple merge

diff --cc Objects/listobject.c
Simple merge

diff --cc Objects/typeobject.c
Simple merge

diff --cc Python/ceval.c
Simple merge

diff --cc setup.py
Simple merge