Skip to content

bpo-28859: Fix return value of ismount on Windows #19109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
digglife wants to merge 4 commits into from
Closed

bpo-28859: Fix return value of ismount on Windows #19109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c959f80
bpo-28859: Fix return value of ismount on Windows
digglife Mar 22, 2020
efca53b
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 22, 2020
9f960ef
use exception approach
digglife Mar 24, 2020
642acc7
Test explicitly when path is under a missing drive.
digglife Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,10 @@ def ismount(path):
return True

if _getvolumepathname:
return path.rstrip(seps) == _getvolumepathname(path).rstrip(seps)
try:
return path.rstrip(seps) == _getvolumepathname(path).rstrip(seps)
except OSError:
return False
else:
return False

Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,14 @@ def test_ismount(self):
self.assertTrue(ntpath.ismount(b"\\\\.\\c:\\"))
self.assertTrue(ntpath.ismount(b"\\\\.\\C:\\"))

for drive in "DEFGHIJKLMNOPQRSTUVWXYZ":
if not ntpath.exists(drive + ":\\"):
self.assertFalse(ntpath.ismount(drive + ":\\NotExist"))
break
else:
if support.verbose:
print("No missing drive found to test 'ismount'")

with support.temp_dir() as d:
self.assertFalse(ntpath.ismount(d))

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2020-03-22-13-33-24.bpo-28859.BvUoOJ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure `ismount` return False instead of raising `FileNotFoundError`
when `path` is under a drive that doesn't exist.