pythongh-115892: Fix ntpath.splitext() with UNC paths

os.path.splitext() on Windows no longer splits an "extension" from the server or share name in the UNC path.
serhiy-storchaka · Feb 27, 2024 · 17c8e26 · 17c8e26
1 parent 3a72fc3
commit 17c8e26
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
@@ -249,9 +249,15 @@ def split(p):
 def splitext(p):
     p = os.fspath(p)
     if isinstance(p, bytes):
-        return genericpath._splitext(p, b'\\', b'/', b'.')
+        seps = (b'\\', b'/')
+        root, ext = genericpath._splitext(p, b'\\', b'/', b'.')
     else:
-        return genericpath._splitext(p, '\\', '/', '.')
+        seps = ('\\', '/')
+        root, ext = genericpath._splitext(p, '\\', '/', '.')
+    if (ext and root[:1] in seps and root[1:2] in seps and
+        root.count(seps[0], 2) + root.count(seps[1], 2) <= 1):
+        return p, p[:0]
+    return root, ext
 splitext.__doc__ = genericpath._splitext.__doc__
 
 

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
@@ -100,6 +100,24 @@ def test_splitext(self):
         tester('ntpath.splitext("xx\\foo.bar.ext")', ('xx\\foo.bar', '.ext'))
         tester('ntpath.splitext("c:a/b\\c.d")', ('c:a/b\\c', '.d'))
 
+        tester(r'ntpath.splitext("\\server\share.ext")',
+               (r'\\server\share.ext', ''))
+        tester(r'ntpath.splitext("//server/share.ext")',
+               (r'//server/share.ext', ''))
+        tester(r'ntpath.splitext("\\server.ext")',
+               (r'\\server.ext', ''))
+        tester(r'ntpath.splitext("//server.ext")',
+               (r'//server.ext', ''))
+
+        tester(r'ntpath.splitext("\\server\share\file.ext")',
+               (r'\\server\share\file', '.ext'))
+        tester(r'ntpath.splitext("//server/share/file.ext")',
+               (r'//server/share/file', '.ext'))
+        tester(r'ntpath.splitext("\\server\share/file.ext")',
+               (r'\\server\share/file', '.ext'))
+        tester(r'ntpath.splitext("//server/share\file.ext")',
+               (r'//server/share\file', '.ext'))
+
     def test_splitdrive(self):
         tester("ntpath.splitdrive('')", ('', ''))
         tester("ntpath.splitdrive('foo')", ('', 'foo'))

diff --git a/Misc/NEWS.d/next/Library/2024-02-27-19-13-25.gh-issue-115892.JouB3p.rst b/Misc/NEWS.d/next/Library/2024-02-27-19-13-25.gh-issue-115892.JouB3p.rst
@@ -0,0 +1,2 @@
+:func:`os.path.splitext` on Windows no longer splits an "extension" from the
+server or share name in the UNC path.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:func:`os.path.splitext` on Windows no longer splits an "extension" from the
		server or share name in the UNC path.