summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/os.py2
-rw-r--r--Lib/pathlib.py6
-rw-r--r--Lib/test/test_os.py6
-rw-r--r--Misc/NEWS.d/next/Library/2023-05-24-22-50-21.gh-issue-104898.UbT2S4.rst1
4 files changed, 10 insertions, 5 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 598c9e5..31b957f 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -1079,6 +1079,8 @@ class PathLike(abc.ABC):
"""Abstract base class for implementing the file system path protocol."""
+ __slots__ = ()
+
@abc.abstractmethod
def __fspath__(self):
"""Return the file system path representation of the object."""
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 3a7a124..fb78939 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -233,7 +233,7 @@ class _PathParents(Sequence):
return "<{}.parents>".format(type(self._path).__name__)
-class PurePath(object):
+class PurePath(os.PathLike):
"""Base class for manipulating paths without I/O.
PurePath represents a filesystem path and offers operations which
@@ -707,10 +707,6 @@ class PurePath(object):
return False
return True
-# Can't subclass os.PathLike from PurePath and keep the constructor
-# optimizations in PurePath.__slots__.
-os.PathLike.register(PurePath)
-
class PurePosixPath(PurePath):
"""PurePath subclass for non-Windows systems.
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 584cc05..c6810c0 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -4640,6 +4640,12 @@ class TestPEP519(unittest.TestCase):
def test_pathlike_class_getitem(self):
self.assertIsInstance(os.PathLike[bytes], types.GenericAlias)
+ def test_pathlike_subclass_slots(self):
+ class A(os.PathLike):
+ __slots__ = ()
+ def __fspath__(self):
+ return ''
+ self.assertFalse(hasattr(A(), '__dict__'))
class TimesTests(unittest.TestCase):
def test_times(self):
diff --git a/Misc/NEWS.d/next/Library/2023-05-24-22-50-21.gh-issue-104898.UbT2S4.rst b/Misc/NEWS.d/next/Library/2023-05-24-22-50-21.gh-issue-104898.UbT2S4.rst
new file mode 100644
index 0000000..e596ab3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-05-24-22-50-21.gh-issue-104898.UbT2S4.rst
@@ -0,0 +1 @@
+Add missing :attr:`~object.__slots__` to :class:`os.PathLike`.