From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 22 Jan 2023 13:19:10 +0000 (-0800)
Subject: [3.10] gh-96192: fix os.ismount() to use a path that is str or bytes (GH-96194) ... 
X-Git-Tag: v3.10.10~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5717ab3ac50aa91d19c1f44f970e7db92619f2c0;p=thirdparty%2FPython%2Fcpython.git

[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>
---

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 526f017acbd5..e550b470da5b 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 8d398ec01035..50cba256cef0 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 000000000000..58e51da6ba39
--- /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()`.