diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-11 08:30:06 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-11 08:30:06 (GMT) |
| commit | a4b9c878e41adcd057e8610c5847c7db0a614a6a (patch) | |
| tree | 3792c15b9357d57ad9d2304088eb76b4957132ca | |
| parent | d0b7ac55560b80eecc8b55706cb4cfe201763fdb (diff) | |
| download | cpython-a4b9c878e41adcd057e8610c5847c7db0a614a6a.zip cpython-a4b9c878e41adcd057e8610c5847c7db0a614a6a.tar.gz cpython-a4b9c878e41adcd057e8610c5847c7db0a614a6a.tar.bz2 | |
Issue #19856: shutil.move() failed to move a directory to other directory
on Windows if source name ends with os.altsep.
| -rw-r--r-- | Lib/shutil.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index f8f0b7d..e12f791 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -259,7 +259,8 @@ def rmtree(path, ignore_errors=False, onerror=None): 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 diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 8160f41..0e81145 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -698,6 +698,15 @@ class TestMove(unittest.TestCase): self._check_move_dir(self.src_dir, self.dir_other_fs, os.path.join(self.dir_other_fs, os.path.basename(self.src_dir))) + def test_move_dir_sep_to_dir(self): + self._check_move_dir(self.src_dir + os.path.sep, self.dst_dir, + os.path.join(self.dst_dir, os.path.basename(self.src_dir))) + + @unittest.skipUnless(os.path.altsep, 'requires os.path.altsep') + def test_move_dir_altsep_to_dir(self): + self._check_move_dir(self.src_dir + os.path.altsep, self.dst_dir, + os.path.join(self.dst_dir, os.path.basename(self.src_dir))) + def test_existing_file_inside_dest_dir(self): # A file with the same name inside the destination dir already exists. with open(self.dst_file, "wb"): @@ -44,6 +44,9 @@ Core and Builtins Library ------- +- Issue #19856: shutil.move() failed to move a directory to other directory + on Windows if source name ends with os.altsep. + - Issue #14983: email.generator now always adds a line end after each MIME boundary marker, instead of doing so only when there is an epilogue. This fixes an RFC compliance bug and solves an issue with signed MIME parts. |