Undo posixpath changes

barneygale · Jan 26, 2024 · Jul 31, 2022 · Jul 31, 2022 · Jul 31, 2022 · Aug 9, 2022
commit 3fb127fbcc4d4eaf26fe833877ef862c40113c38
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
@@ -305,8 +305,7 @@ the :mod:`glob` module.)
    as well as DOS device names such as "NUL", "CON", "CONIN$", "CONOUT$",
    "AUX", "PRN", "COM1", and "LPT1".
 
-   On POSIX platforms, paths that contains NUL characters are reserved; all
-   other paths are unreserved.
+   .. availability:: Windows.
 
    .. versionadded:: 3.12
 

@@ -505,26 +505,23 @@ Pure paths provide the following methods and properties:
 
 .. method:: PurePath.is_reserved()
 
-   Return ``True`` if the path is considered reserved, ``False`` otherwise.
+   With :class:`PureWindowsPath`, return ``True`` if the path is considered
+   reserved under Windows, ``False`` otherwise.  With :class:`PurePosixPath`,
+   ``False`` is always returned.
+
 
       >>> PureWindowsPath('nul').is_reserved()
       True
-      >>> PurePosixPath('\x00').is_reserved()
-      True
+      >>> PurePosixPath('nul').is_reserved()
+      False
 
    File system calls on reserved paths can fail mysteriously or have
    unintended effects.
 
-   .. seealso::
-      :func:`os.path.isreserved`, which is used to implement this method.
-
    .. versionchanged: 3.12
       Windows path names that contain a colon, or end with a dot or a space,
       are considered reserved. UNC paths may be reserved.
 
-   .. versionchanged: 3.12
-      POSIX path names that contain a NUL character are considered reserved.
-
 
 .. method:: PurePath.joinpath(*other)
 
@@ -1400,7 +1397,6 @@ Below is a table mapping various :mod:`os` functions to their corresponding
                                        :meth:`Path.owner`,
                                        :meth:`Path.group`
 :func:`os.path.isabs`                  :meth:`PurePath.is_absolute`
-:func:`os.path.isreserved`             :meth:`PurePath.is_reserved`
 :func:`os.path.join`                   :func:`PurePath.joinpath`
 :func:`os.path.basename`               :data:`PurePath.name`
 :func:`os.path.dirname`                :data:`PurePath.parent`

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
@@ -31,8 +31,8 @@
 __all__ = ["normcase","isabs","join","splitdrive","split","splitext",
            "basename","dirname","commonprefix","getsize","getmtime",
            "getatime","getctime","islink","exists","lexists","isdir","isfile",
-           "ismount","isreserved","expanduser","expandvars","normpath",
-           "abspath","samefile","sameopenfile","samestat",
+           "ismount", "expanduser","expandvars","normpath","abspath",
+           "samefile","sameopenfile","samestat",
            "curdir","pardir","sep","pathsep","defpath","altsep","extsep",
            "devnull","realpath","supports_unicode_filenames","relpath",
            "commonpath"]
@@ -216,18 +216,6 @@ def ismount(path):
     return False
 
 
-def isreserved(path):
-    """Return true if the pathname is reserved by the system."""
-    path = os.fsencode(path)
-    return b'\0' in path
-
-
-def isreservedname(name):
-    """Return true if the filename is reserved by the system."""
-    name = os.fsencode(name)
-    return b'\0' in name or b'/' in name
-
-
 # Expand paths beginning with '~' or '~user'.
 # '~' means $HOME; '~user' means that user's home directory.
 # If the path doesn't begin with '~', or if the user or $HOME is unknown,

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
@@ -242,35 +242,6 @@ def fake_lstat(path):
         finally:
             os.lstat = save_lstat
 
-    def test_isreserved(self):
-        # Regular ol' paths are unreserved.
-        self.assertFalse(posixpath.isreserved(''))
-        self.assertFalse(posixpath.isreserved(b''))
-        self.assertFalse(posixpath.isreserved('/'))
-        self.assertFalse(posixpath.isreserved(b'/'))
-        self.assertFalse(posixpath.isreserved('hi'))
-        self.assertFalse(posixpath.isreserved(b'hi'))
-
-        # '.' and '..' are unreserved.
-        self.assertFalse(posixpath.isreserved('.'))
-        self.assertFalse(posixpath.isreserved(b'.'))
-        self.assertFalse(posixpath.isreserved('..'))
-        self.assertFalse(posixpath.isreserved(b'..'))
-
-        # Paths reserved on Windows aren't reserved here.
-        self.assertFalse(posixpath.isreserved('NUL'))
-        self.assertFalse(posixpath.isreserved(b'NUL'))
-
-        # Null bytes ARE reserved
-        self.assertTrue(posixpath.isreserved('\x00'))
-        self.assertTrue(posixpath.isreserved(b'\x00'))
-        self.assertTrue(posixpath.isreserved('ham/eggs\x00beans/tomato'))
-        self.assertTrue(posixpath.isreserved(b'ham/eggs\x00beans/tomato'))
-
-        # Other special characters are not reserved.
-        self.assertFalse(posixpath.isreserved('\x01'))
-        self.assertFalse(posixpath.isreserved(b'\x01'))
-
     def test_expanduser(self):
         self.assertEqual(posixpath.expanduser("foo"), "foo")
         self.assertEqual(posixpath.expanduser(b"foo"), b"foo")

diff --git a/Misc/NEWS.d/next/Library/2022-07-31-01-24-40.gh-issue-88569.eU0--b.rst b/Misc/NEWS.d/next/Library/2022-07-31-01-24-40.gh-issue-88569.eU0--b.rst
@@ -1,3 +1,2 @@
-Add :func:`os.path.isreserved`, which identifies reserved pathnames. On
-Windows, reserved names include "NUL", "AUX" and "CON". On other platforms,
-this function always returns ``False``.
+Add :func:`ntpath.isreserved`, which identifies reserved pathnames on
+Windows; reserved names include "NUL", "AUX" and "CON".