diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/shutil.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 9 |
2 files changed, 11 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"): |