summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-14 00:25:11 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-14 00:25:11 (GMT)
commitcd1aa9158ec89d541ed6309f1766e188778a1499 (patch)
treeade883e587d7422368aeab91e02665e0b84db7a9 /Lib
parent0a8f43e85a002db670f358b65fba1e094fd7f4b5 (diff)
parent52a3b74900db90dfbc5d6ce5145bce02d172b1b1 (diff)
downloadcpython-cd1aa9158ec89d541ed6309f1766e188778a1499.zip
cpython-cd1aa9158ec89d541ed6309f1766e188778a1499.tar.gz
cpython-cd1aa9158ec89d541ed6309f1766e188778a1499.tar.bz2
merge 3.4 (#23929)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/os.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 90beab9..3d2c6d3 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -272,7 +272,7 @@ def renames(old, new):
empty. Works like rename, except creation of any intermediate
directories needed to make the new pathname good is attempted
first. After the rename, directories corresponding to rightmost
- path segments of the old name will be pruned way until either the
+ path segments of the old name will be pruned until either the
whole path is consumed or a nonempty directory is found.
Note: this function can fail with the new directory structure made