diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-01-22 13:19:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 13:19:10 (GMT) |
| commit | 5717ab3ac50aa91d19c1f44f970e7db92619f2c0 (patch) | |
| tree | 90f7bdb3205cc664734a84a23058a0a2f8be0292 | |
| parent | caa6bcfb8c85e79df1ed55e2de971ec15a2e3886 (diff) | |
| download | cpython-5717ab3ac50aa91d19c1f44f970e7db92619f2c0.zip cpython-5717ab3ac50aa91d19c1f44f970e7db92619f2c0.tar.gz cpython-5717ab3ac50aa91d19c1f44f970e7db92619f2c0.tar.bz2 | |
[3.10] gh-96192: fix os.ismount() to use a path that is str or bytes (GH-96194) (#99456)
gh-96192: fix os.ismount() to use a path that is str or bytes (GH-96194)
(cherry picked from commit 367f552129341796d75fc4cc40edb49405235a2b)
Signed-off-by: Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>
Co-authored-by: Christoph Anton Mitterer <calestyo@scientia.org>
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 526f017..e550b47 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 8d398ec..50cba25 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()`. |