gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

barneygale · 2022-12-19T23:02:58Z

Fix handling of partial and invalid UNC drives in ntpath.splitdrive(), and in ntpath.normpath() on non-Windows systems.

Paths such as \\server and \\ are now considered by splitdrive() to contain only a drive, and consequently are not modified by normpath() on non-Windows systems. The behaviour of normpath() on Windows systems is unaffected, as native OS APIs are used.

This brings the Python implementation of ntpath.normpath() more in line with the C implementation added in 99fcf15.

Implementation by @eryksun. I added tests and NEWS.

Issue: ntpath.normpath('\\\\') produces different result on Windows #96290

…splitdrive() This brings the Python implementation of `ntpath.normpath()` in line with the C implementation added in 99fcf15 Co-authored-by: Eryk Sun <eryksun@gmail.com>

eryksun · 2022-12-22T18:17:22Z

This brings the Python implementation of ntpath.normpath() in line with the C implementation

Almost. The C implementation is incorrect for "UNC" device paths. For example:

>>> nt._path_normpath('//?/UNC/server/share/..')
'\\\\?\\UNC\\server'

The problem is that it handles "//?/UNC/" as the root instead of "//?/UNC/server/share/". The pure Python implementation gets it right.

barneygale · 2022-12-22T19:55:08Z

I've changed "in line" to "more in line" :-)

Lib/ntpath.py

Lib/test/test_ntpath.py

Co-authored-by: Eryk Sun <eryksun@gmail.com>

Lib/test/test_ntpath.py

Co-authored-by: Eryk Sun <eryksun@gmail.com>

Lib/test/test_ntpath.py

Co-authored-by: Eryk Sun <eryksun@gmail.com>

Lib/test/test_ntpath.py

Co-authored-by: Eryk Sun <eryksun@gmail.com>

Lib/test/test_ntpath.py

zooba · 2023-01-11T13:16:18Z

If Eryk and Barney both say this is ready, I'm happy to merge.

barneygale · 2023-01-12T00:07:23Z

It's ready to land I think!

eryksun · 2023-01-12T06:27:02Z

A long-standing issue with ntpath.isabs() is fixed, and it no longer depends on splitdrive(). We need a couple of tests in test_isabs(). I'd like to test a normal UNC path and a device path, both without a trailing backslash. They're really the same case as far as the new implementation is concerned, but I feel better with both being tested. In the old implementation, isabs() incorrectly returns false for these two cases.

        tester('ntpath.isabs("\\\\conky\\mountpoint")', 1)
        tester('ntpath.isabs("\\\\.\\C:")', 1)

…lashes

eryksun · 2023-01-12T17:17:03Z

@zooba, it's ready to be merged.

miss-islington · 2023-01-12T19:25:01Z

Thanks @barneygale for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington · 2023-01-12T19:25:06Z

Sorry, @barneygale and @zooba, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 005e69403d638f9ff8f71e59960c600016e101a4 3.11

bedevere-bot · 2023-01-12T19:28:26Z

GH-100999 is a backport of this pull request to the 3.11 branch.

…() and splitdrive() (pythonGH-100351) This brings the Python implementation of `ntpath.normpath()` in line with the C implementation added in 99fcf15 Co-authored-by: Eryk Sun <eryksun@gmail.com>

… splitdrive() (GH-100351) This brings the Python implementation of `ntpath.normpath()` in line with the C implementation added in 99fcf15 Co-authored-by: Barney Gale <barney.gale@gmail.com> Co-authored-by: Eryk Sun <eryksun@gmail.com>

barneygale · 2023-01-12T21:44:32Z

Thank you both!

bedevere-bot mentioned this pull request Dec 19, 2022

ntpath.normpath('\\\\') produces different result on Windows #96290

Closed

bedevere-bot added the awaiting review label Dec 19, 2022

barneygale force-pushed the gh-96290-ntpath-normpath-fix branch from 471c47b to 7ab642b Compare December 20, 2022 00:13

pythongh-96290: support partial/invalid UNC drives in normpath() and …

1fb70c7

…splitdrive() This brings the Python implementation of `ntpath.normpath()` in line with the C implementation added in 99fcf15 Co-authored-by: Eryk Sun <eryksun@gmail.com>

barneygale force-pushed the gh-96290-ntpath-normpath-fix branch from 7ab642b to 1fb70c7 Compare December 20, 2022 00:54

barneygale marked this pull request as ready for review December 20, 2022 00:55

barneygale requested a review from brettcannon as a code owner December 20, 2022 00:55

brettcannon requested review from eryksun and a team December 20, 2022 01:15

barneygale mentioned this pull request Dec 20, 2022

gh-68320, gh-88302 - Allow for pathlib.Path subclassing #31691

Merged

Merge branch 'main' into pythongh-96290-ntpath-normpath-fix

953f937

eryksun reviewed Dec 27, 2022

View reviewed changes

Lib/ntpath.py Outdated Show resolved Hide resolved

eryksun reviewed Dec 27, 2022

View reviewed changes

Lib/test/test_ntpath.py Show resolved Hide resolved

eryksun reviewed Dec 27, 2022

View reviewed changes

Lib/test/test_ntpath.py Show resolved Hide resolved

barneygale and others added 2 commits December 28, 2022 22:56

Update Lib/ntpath.py

d2818a3

Co-authored-by: Eryk Sun <eryksun@gmail.com>

Fix tests

5965f0f

barneygale requested review from eryksun and removed request for brettcannon December 29, 2022 15:34

eryksun reviewed Dec 29, 2022

View reviewed changes

Lib/test/test_ntpath.py Outdated Show resolved Hide resolved

Update Lib/test/test_ntpath.py

58d5d9f

Co-authored-by: Eryk Sun <eryksun@gmail.com>

eryksun reviewed Dec 29, 2022

View reviewed changes

Lib/test/test_ntpath.py Outdated Show resolved Hide resolved

Update Lib/test/test_ntpath.py

bad4b5d

Co-authored-by: Eryk Sun <eryksun@gmail.com>

eryksun reviewed Dec 29, 2022

View reviewed changes

Lib/test/test_ntpath.py Outdated Show resolved Hide resolved

Update Lib/test/test_ntpath.py

5b67a74

Co-authored-by: Eryk Sun <eryksun@gmail.com>

zooba reviewed Jan 10, 2023

View reviewed changes

Lib/test/test_ntpath.py Outdated Show resolved Hide resolved

barneygale added 3 commits January 10, 2023 18:27

Tweak handling of terminal slash in UNC drives

0b58cd4

Reduce splitdrive() diff

165761d

Restore normpath() test with empty share name

1f7d54b

barneygale added 3.11 only security fixes 3.12 bugs and security fixes needs backport to 3.11 only security fixes and removed 3.11 only security fixes 3.12 bugs and security fixes labels Jan 11, 2023

Add test for normal UNC paths and device paths without trailing backs…

e2e6606

…lashes

barneygale requested a review from eryksun January 12, 2023 17:01

zooba merged commit 005e694 into python:main Jan 12, 2023

bedevere-bot removed the awaiting review label Jan 12, 2023

miss-islington assigned zooba Jan 12, 2023

bedevere-bot removed the needs backport to 3.11 only security fixes label Jan 12, 2023

rmartin16 mentioned this pull request Feb 8, 2023

CI Failures on Windows for Python 3.12.0a5 beeware/briefcase#1087

Closed

Grub4K mentioned this pull request Sep 17, 2023

utils.sanitize_path behavioral differences <3.12 yt-dlp/yt-dlp#8137

Closed

10 tasks

barneygale mentioned this pull request Jan 4, 2024

Windows os.path.isabs UNC path bug #66498

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

barneygale commented Dec 19, 2022 •

edited

Loading

eryksun commented Dec 22, 2022

barneygale commented Dec 22, 2022

zooba commented Jan 11, 2023

barneygale commented Jan 12, 2023

eryksun commented Jan 12, 2023 •

edited

Loading

eryksun commented Jan 12, 2023

miss-islington commented Jan 12, 2023

miss-islington commented Jan 12, 2023

bedevere-bot commented Jan 12, 2023

barneygale commented Jan 12, 2023

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

Conversation

barneygale commented Dec 19, 2022 • edited Loading

eryksun commented Dec 22, 2022

barneygale commented Dec 22, 2022

zooba commented Jan 11, 2023

barneygale commented Jan 12, 2023

eryksun commented Jan 12, 2023 • edited Loading

eryksun commented Jan 12, 2023

miss-islington commented Jan 12, 2023

miss-islington commented Jan 12, 2023

bedevere-bot commented Jan 12, 2023

barneygale commented Jan 12, 2023

barneygale commented Dec 19, 2022 •

edited

Loading

eryksun commented Jan 12, 2023 •

edited

Loading