#7909: the prefixes \\.\ and \\?\ indicate special Windows paths, do not try to manip...

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index a6bcca4f4a1b9cb4caf6cd543c46dbecb077ca8e..ee7ac679c033be660cd4b1da659e459a454caffe 100644 (file)
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -71,6 +71,12 @@ def _get_colon(path):
     else:
         return ':'
 
+def _get_special(path):
+    if isinstance(path, bytes):
+        return (b'\\\\.\\', b'\\\\?\\')
+    else:
+        return ('\\\\.\\', '\\\\?\\')
+
 # Normalize the case of a pathname and map slashes to backslashes.
 # Other normalizations (such as optimizing '../' away) are not done
 # (this is done by normpath).
@@ -524,6 +530,13 @@ def normpath(path):
     """Normalize path, eliminating double slashes, etc."""
     sep = _get_sep(path)
     dotdot = _get_dot(path) * 2
+    special_prefixes = _get_special(path)
+    if path.startswith(special_prefixes):
+        # in the case of paths with these prefixes:
+        # \\.\ -> device names
+        # \\?\ -> literal paths
+        # do not do any normalization, but return the path unchanged
+        return path
     path = path.replace(_get_altsep(path), sep)
     prefix, path = splitdrive(path)
 

diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 0fd81b63ceb53b31b0c8a2f1da780fce629bd373..86e3eda46b8d15fc0d371d293dd4d0bf1709674a 100644 (file)
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -174,6 +174,9 @@ class TestNtpath(unittest.TestCase):
         tester("ntpath.normpath('C:////a/b')", r'C:\a\b')
         tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b')
 
+        tester("ntpath.normpath('\\\\.\\NUL')", r'\\.\NUL')
+        tester("ntpath.normpath('\\\\?\\D:/XY\\Z')", r'\\?\D:/XY\Z')
+
     def test_expandvars(self):
         with support.EnvironmentVarGuard() as env:
             env.clear()

diff --git a/Misc/NEWS b/Misc/NEWS
index 768c7df05396a1a6fb708cf96251d2d6cba8d621..398f7db6e10f545415c27f87a5444bf4c79ea68a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7909: Do not touch paths with the special prefixes ``\\.\``
+  or ``\\?\`` in ntpath.normpath().
+
 - Issue #1286: Allow using fileinput.FileInput as a context manager.
 
 - Add lfu_cache() and lru_cache() decorators to the functools module.