[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23929)
benjamin.peterson
python-checkins at python.org
Tue Apr 14 02:25:16 CEST 2015
https://hg.python.org/cpython/rev/4f90751edb4f
changeset: 95626:4f90751edb4f
parent: 95623:e1457e9f340f
parent: 95624:94c3cd410cf6
user: Benjamin Peterson <benjamin at python.org>
date: Mon Apr 13 20:25:11 2015 -0400
summary:
merge 3.4 (#23929)
files:
Lib/os.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/os.py b/Lib/os.py
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -272,7 +272,7 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list