diff options
| -rw-r--r-- | Lib/shutil.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 2c00f4a..3cafd01 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -426,6 +426,9 @@ def rmtree(path, ignore_errors=False, onerror=None): def onerror(*args): raise if _use_fd_functions: + # While the unsafe rmtree works fine on bytes, the fd based does not. + if isinstance(path, bytes): + path = os.fsdecode(path) # Note: To guard against symlink races, we use the standard # lstat()/open()/fstat() trick. try: diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index c879fdd..d23deee 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -108,6 +108,15 @@ class TestShutil(unittest.TestCase): self.tempdirs.append(d) return d + def test_rmtree_works_on_bytes(self): + tmp = self.mkdtemp() + victim = os.path.join(tmp, 'killme') + os.mkdir(victim) + write_file(os.path.join(victim, 'somefile'), 'foo') + victim = os.fsencode(victim) + self.assertIsInstance(victim, bytes) + shutil.rmtree(victim) + def test_rmtree_errors(self): # filename is guaranteed not to exist filename = tempfile.mktemp() |