diff options
| author | Christoph Anton Mitterer <calestyo@scientia.org> | 2022-11-14 04:12:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 04:12:32 (GMT) |
| commit | 367f552129341796d75fc4cc40edb49405235a2b (patch) | |
| tree | 04ba5866ad2e28e7143be803eecf133c0f7e5847 | |
| parent | 1455c516fce829f8d46e4f15557afe8653e7e995 (diff) | |
| download | cpython-367f552129341796d75fc4cc40edb49405235a2b.zip cpython-367f552129341796d75fc4cc40edb49405235a2b.tar.gz cpython-367f552129341796d75fc4cc40edb49405235a2b.tar.bz2 | |
gh-96192: fix os.ismount() to use a path that is str or bytes (#96194)
Signed-off-by: Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>
Co-authored-by: Eryk Sun <eryksun@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
| -rw-r--r-- | Lib/posixpath.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_posixpath.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2022-08-23-03-13-18.gh-issue-96192.TJywOF.rst | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 5e1ebe3..5b4d78b 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -195,6 +195,7 @@ def ismount(path): if stat.S_ISLNK(s1.st_mode): return False + path = os.fspath(path) if isinstance(path, bytes): parent = join(path, b'..') else: diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index c644f88..8a1dd13 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -178,6 +178,8 @@ class PosixPathTest(unittest.TestCase): def test_ismount(self): self.assertIs(posixpath.ismount("/"), True) self.assertIs(posixpath.ismount(b"/"), True) + self.assertIs(posixpath.ismount(FakePath("/")), True) + self.assertIs(posixpath.ismount(FakePath(b"/")), True) def test_ismount_non_existent(self): # Non-existent mountpoint. diff --git a/Misc/NEWS.d/next/Library/2022-08-23-03-13-18.gh-issue-96192.TJywOF.rst b/Misc/NEWS.d/next/Library/2022-08-23-03-13-18.gh-issue-96192.TJywOF.rst new file mode 100644 index 0000000..58e51da --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-08-23-03-13-18.gh-issue-96192.TJywOF.rst @@ -0,0 +1 @@ +Fix handling of ``bytes`` :term:`path-like objects <path-like object>` in :func:`os.ismount()`. |