#11515: Merge with 3.2.

diff --cc Lib/collections/__init__.py
index 922bba28d15bbcb3cc668cdc79057fae374023a1,98c432575344e66900f9624a406f81280adc0559..c324ce3bd65ecfbd7596e489dc5f0cb06c5d0baf
--- 1/Lib/collections/__init__.py
--- 2/Lib/collections.py
+++ b/Lib/collections/__init__.py
@@@ -1,11 -1,10 +1,11 @@@
  __all__ = ['deque', 'defaultdict', 'namedtuple', 'UserDict', 'UserList',
              'UserString', 'Counter', 'OrderedDict']
 -# For bootstrapping reasons, the collection ABCs are defined in _abcoll.py.
 -# They should however be considered an integral part of collections.py.
 -from _abcoll import *
 -import _abcoll
 -__all__ += _abcoll.__all__
 +
- # For backwards compatability, continue to make the collections ABCs
++# For backwards compatibility, continue to make the collections ABCs
 +# available through the collections module.
 +from collections.abc import *
 +import collections.abc
 +__all__ += collections.abc.__all__
  
  from _collections import deque, defaultdict
  from operator import itemgetter as _itemgetter

diff --cc Lib/ftplib.py
Simple merge

diff --cc Lib/http/client.py
Simple merge

diff --cc Lib/importlib/_bootstrap.py
Simple merge

diff --cc Lib/nntplib.py
Simple merge

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

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

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

diff --cc Modules/_threadmodule.c
Simple merge

diff --cc Modules/posixmodule.c
index b07ce9c9dd5b4282bbabc246cd5b48d8b81689d8,89d3f2f2d0b783d32eb2a9307692f9d6ce5bfe29..8332cfe1417f64e4216fe024813cbec84a01614f
--- 1/Modules/posixmodule.c
--- 2/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@@ -1308,9 -1281,9 +1308,9 @@@ win32_xstat_w(const wchar_t *path, stru
     win32_stat will first explicitly resolve the symlink target and then will
     call win32_lstat on that result.
  
-    The _w represent Unicode equivalents of the aformentioned ANSI functions. */
+    The _w represent Unicode equivalents of the aforementioned ANSI functions. */
  
 -static int 
 +static int
  win32_lstat(const char* path, struct win32_stat *result)
  {
      return win32_xstat(path, result, FALSE);

diff --cc Objects/bytearrayobject.c
Simple merge

diff --cc Python/sysmodule.c
Simple merge

diff --cc setup.py
Simple merge