Skip to content

[3.11] GH-88013: Fix TypeError raised by ntpath.realpath in some cases (GH-102813) #103343

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
merged 2 commits into from
Apr 7, 2023
Merged

[3.11] GH-88013: Fix TypeError raised by ntpath.realpath in some cases (GH-102813) #103343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ce0330
GH-88013: Fix TypeError raised by ntpath.realpath in some cases (GH-1…
aisk Apr 7, 2023
9757c62
Update test case to not use `os.listdrives()`
barneygale Apr 7, 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
2 changes: 1 addition & 1 deletion Lib/ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ def _getfinalpathname_nonstrict(path):

# Non-strict algorithm is to find as much of the target directory
# as we can and join the rest.
tail = ''
tail = path[:0]
while path:
try:
path = _getfinalpathname(path)
Expand Down
11 changes: 11 additions & 0 deletions Lib/test/test_ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import ntpath
import os
import string
import sys
import unittest
import warnings
Expand Down Expand Up @@ -321,6 +322,16 @@ def test_realpath_basic(self):
self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1")),
os.fsencode(ABSTFN))

# gh-88013: call ntpath.realpath with binary drive name may raise a
# TypeError. The drive should not exist to reproduce the bug.
for c in string.ascii_uppercase:
d = f"{c}:\\"
if not ntpath.exists(d):
break
else:
raise OSError("No free drive letters available")
self.assertEqual(ntpath.realpath(d), d)

@os_helper.skip_unless_symlink
@unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
def test_realpath_strict(self):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2023-03-18-21-38-00.gh-issue-88013.Z3loxC.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed a bug where :exc:`TypeError` was raised when calling
:func:`ntpath.realpath` with a bytes parameter in some cases.