Skip to content

gh-100809: Fix handling of drive-relative paths in pathlib.Path.absolute() #100812

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

Merged
zooba merged 11 commits into from
Feb 17, 2023
+64 −1
Merged

gh-100809: Fix handling of drive-relative paths in pathlib.Path.absolute() #100812

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
28e7831
gh-100809: Fix handling of drive-relative paths in pathlib.Path.absol…
barneygale Jan 5, 2023
4b5d333
Call _getfullpathname() on the drive (if any), not the full path
barneygale Jan 6, 2023
d2649a6
Undo unnecessary test changes
barneygale Jan 6, 2023
2271a4e
Stop handling ValueError and OSError from _getfullpathname()
barneygale Jan 7, 2023
ad9db67
Add test for drive-specific current directory on non-current drive.
barneygale Jan 7, 2023
4bb81ee
Apply suggestions from code review
barneygale Jan 8, 2023
5dd9af2
Move DOS device constants into `try:` block
barneygale Jan 8, 2023
b19e6a0
Tidy up test code slightly
barneygale Jan 8, 2023
5e1d4aa
Simplify implementation
barneygale Feb 16, 2023
ce26d13
Merge branch 'main' into gh-100809-path-absolute-nt
barneygale Feb 16, 2023
5f1cf01
Update Misc/NEWS.d/next/Library/2023-01-06-21-14-41.gh-issue-100809.I…
barneygale Feb 17, 2023
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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Eryk Sun <eryksun@gmail.com>
  • Loading branch information
@barneygale @eryksun
barneygale and eryksun authored Jan 8, 2023
commit 4bb81ee9d7a1c992302229d4d36465aab5acf96a
4 changes: 2 additions & 2 deletions Lib/test/support/os_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ def __exit__(self, *ignore_exc):
kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
except (ImportError, AttributeError):
def subst_drive(path):
raise NotImplementedError('ctypes or kernel32 is not available')
raise unittest.SkipTest('ctypes or kernel32 is not available')
else:
ERROR_FILE_NOT_FOUND = 2
DDD_REMOVE_DEFINITION = 2
Expand All @@ -740,7 +740,7 @@ def subst_drive(path):
ctypes.get_last_error() == ERROR_FILE_NOT_FOUND):
break
else:
raise FileExistsError('no available logical drive')
raise unittest.SkipTest('no available logical drive')
if not kernel32.DefineDosDeviceW(
DDD_NO_BROADCAST_SYSTEM, drive, path):
raise ctypes.WinError(ctypes.get_last_error())
Expand Down
6 changes: 4 additions & 2 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3014,8 +3014,10 @@ def test_absolute(self):

with os_helper.subst_drive(BASE) as other_drive:
other_cwd = f'{other_drive}\\dirA'
with os_helper.change_cwd(other_cwd):
pass
# set the working directory on the substitute drive
saved_dir = os.getcwd()
os.chdir(other_cwd)
os.chdir(saved_dir)

# Relative path on another drive
self.assertEqual(str(P(other_drive).absolute()), other_cwd)
Expand Down