10000 GH-125069: Fix inconsistent joining in `WindowsPath(PosixPath(...))` by barneygale · Pull Request #125156 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-125069: Fix inconsistent joining in WindowsPath(PosixPath(...)) #125156

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 6 commits into from
Oct 13, 2024
Merged

GH-125069: Fix inconsistent joining in WindowsPath(PosixPath(...)) #125156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d90005
GH-125069: Fix inconsistent joining in `WindowsPath(PosixPath(...))`
barneygale Oct 8, 2024
307f6d7
Merge branch 'main' into gh-125069
barneygale Oct 11, 2024
e0799ae
Update Misc/NEWS.d/next/Library/2024-10-08-21-17-16.gh-issue-125069.0…
barneygale Oct 11, 2024
39641af
May as well use as_posix()
barneygale Oct 13, 2024
4cfb6a1
Merge branch 'main' into gh-125069
barneygale Oct 13, 2024
fe68d84
Simplify
barneygale Oct 13, 2024
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
4 changes: 2 additions & 2 deletions Lib/pathlib/_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def __init__(self, *args):
paths = []
for arg in args:
if isinstance(arg, PurePath):
if arg.parser is ntpath and self.parser is posixpath:
if arg.parser is not self.parser:
# GH-103631: Convert separators for backwards compatibility.
paths.extend(path.replace('\\', '/') for path in arg._raw_paths)
paths.append(arg.as_posix())
else:
paths.extend(arg._raw_paths)
else:
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_pathlib/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@ def test_constructor_nested(self):
self.assertEqual(P(P('a'), P('b'), P('c')), P(FakePath("a/b/c")))
self.assertEqual(P(P('./a:b')), P('./a:b'))

@needs_windows
def test_constructor_nested_foreign_flavour(self):
# See GH-125069.
p1 = pathlib.PurePosixPath('b/c:\\d')
p2 = pathlib.PurePosixPath('b/', 'c:\\d')
self.assertEqual(p1, p2)
self.assertEqual(self.cls(p1), self.cls('b/c:/d'))
self.assertEqual(self.cls(p2), self.cls('b/c:/d'))

def _check_parse_path(self, raw_path, *expected):
sep = self.parser.sep
actual = self.cls._parse_path(raw_path.replace('/', sep))
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2024-10-08-21-17-16.gh-issue-125069.0RP0Mx.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix an issue where providing a :class:`pathlib.PurePath` object as an
initializer argument to a second :class:`~pathlib.PurePath` object with a
different :attr:`~pathlib.PurePath.parser` resulted in arguments to the
former object's initializer being joined by the latter object's parser.
Loading
0