Merge branch 'main' into fix-ntpath.abspath

python · nineteendo · May 31, 2024 · May 31, 2024 · May 31, 2024 · May 31, 2024
commit e8dea34a753200782b84003746d7902ce1966e42
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
diff --git a/Python/fileutils.c b/Python/fileutils.c
@@ -2512,19 +2512,9 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize,

    Py_ssize_t drvsize, rootsize;
    _Py_skiproot(path, size, &drvsize, &rootsize);
-    if (p1[0] == L'.' && IS_SEP(&p1[1])) {
-        // Skip leading '.\'
-        p1 = &path[2];
-        while (IS_SEP(p1)) {
-            p1++;
-        }
-        lastC = SEP;
-        explicit = 1;
-    }
-    else {
-        if (drvsize || rootsize) {
-            // Skip past root and update minP2
-            p1 = &path[drvsize + rootsize];
+    if (drvsize || rootsize) {
+        // Skip past root and update minP2
+        p1 = &path[drvsize + rootsize];
 #ifndef ALTSEP
        p2 = p1;
 #else
@@ -2553,6 +2543,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize,
        while (IS_SEP(p1)) {
            p1++;
        }
+        explicit = 1;
    }

    /* if pEnd is specified, check that. Else, check for null terminator */