From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 15 Mar 2011 04:03:08 +0000 (+0200)
Subject: #11515: Merge with 3.2.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=373089239b26e7445aa44a3501c7056cfa4c3728;p=python

#11515: Merge with 3.2.
---

373089239b26e7445aa44a3501c7056cfa4c3728
diff --cc Lib/collections/__init__.py
index 922bba28d1,98c4325753..c324ce3bd6
--- a/Lib/collections/__init__.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 Modules/posixmodule.c
index b07ce9c9dd,89d3f2f2d0..8332cfe141
--- a/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);