summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-02-11 08:30:59 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-02-11 08:30:59 (GMT)
commit3a308b9f374da7f11df888f104dae6464e81d73d (patch)
tree2c2c4c76ca9945fd642051dacb2d2dc235a11b76 /Lib/shutil.py
parentc2f665e721e4e4629cc4a2c5eb6464c3dc7325e3 (diff)
downloadcpython-3a308b9f374da7f11df888f104dae6464e81d73d.zip
cpython-3a308b9f374da7f11df888f104dae6464e81d73d.tar.gz
cpython-3a308b9f374da7f11df888f104dae6464e81d73d.tar.bz2
Issue #19856: shutil.move() failed to move a directory to other directory
on Windows if source name ends with os.altsep.
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 5320f23..5a4d4f6 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -484,7 +484,8 @@ rmtree.avoids_symlink_attacks = _use_fd_functions
def _basename(path):
# A basename() variant which first strips the trailing slash, if present.
# Thus we always get the last component of the path, even for directories.
- return os.path.basename(path.rstrip(os.path.sep))
+ sep = os.path.sep + (os.path.altsep or '')
+ return os.path.basename(path.rstrip(sep))
def move(src, dst):
"""Recursively move a file or directory to another location. This is