mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

GH-128520: Merge pathlib._abc into pathlib.types (#130747)

Browse source 
There used to be a meaningful distinction between these modules: `pathlib`
imported `pathlib._abc` but not `pathlib.types`. This is no longer the
case (neither module is imported), so we move the ABCs as follows:

- `pathlib._abc.JoinablePath` --> `pathlib.types._JoinablePath`
- `pathlib._abc.ReadablePath` --> `pathlib.types._ReadablePath`
- `pathlib._abc.WritablePath` --> `pathlib.types._WritablePath`
This commit is contained in:
Barney Gale 2025-03-03 17:56:57 +00:00 • committed by GitHub
parent 321bf59512
commit d0eb01c9de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 406 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_pathlib/test_pathlib.py
View file

@ -1059,14 +1059,14 @@ class PathTest(test_pathlib_abc.RWPathTest, PurePathTest):
return d
def test_matches_writablepath_docstrings(self):
path_names = {name for name in dir(pathlib._abc.WritablePath) if name[0] != '_'}
path_names = {name for name in dir(pathlib.types._WritablePath) if name[0] != '_'}
for attr_name in path_names:
if attr_name == 'parser':
# On Windows, Path.parser is ntpath, but WritablePath.parser is
# posixpath, and so their docstrings differ.
continue
our_attr = getattr(self.cls, attr_name)
path_attr = getattr(pathlib._abc.WritablePath, attr_name)
path_attr = getattr(pathlib.types._WritablePath, attr_name)
self.assertEqual(our_attr.__doc__, path_attr.__doc__)
def test_concrete_class(self):

22
Lib/test/test_pathlib/test_pathlib_abc.py
View file

@ -4,8 +4,8 @@ import os
import errno
import unittest
from pathlib._abc import JoinablePath, ReadablePath, WritablePath, magic_open
from pathlib.types import _PathParser, PathInfo
from pathlib._os import magic_open
from pathlib.types import _PathParser, PathInfo, _JoinablePath, _ReadablePath, _WritablePath
import posixpath
from test.support.os_helper import TESTFN
@ -31,7 +31,7 @@ def needs_windows(fn):
#
class DummyJoinablePath(JoinablePath):
class DummyJoinablePath(_JoinablePath):
__slots__ = ('_segments',)
parser = posixpath
@ -78,7 +78,7 @@ class JoinablePathTest(unittest.TestCase):
def test_is_joinable(self):
p = self.cls(self.base)
self.assertIsInstance(p, JoinablePath)
self.assertIsInstance(p, _JoinablePath)
def test_parser(self):
self.assertIsInstance(self.cls.parser, _PathParser)
@ -855,7 +855,7 @@ class DummyReadablePathInfo:
return False
class DummyReadablePath(ReadablePath, DummyJoinablePath):
class DummyReadablePath(_ReadablePath, DummyJoinablePath):
"""
Simple implementation of DummyReadablePath that keeps files and
directories in memory.
@ -900,7 +900,7 @@ class DummyReadablePath(ReadablePath, DummyJoinablePath):
raise NotImplementedError
class DummyWritablePath(WritablePath, DummyJoinablePath):
class DummyWritablePath(_WritablePath, DummyJoinablePath):
__slots__ = ()
def __open_wb__(self, buffering=-1):
@ -999,7 +999,7 @@ class ReadablePathTest(JoinablePathTest):
def test_is_readable(self):
p = self.cls(self.base)
self.assertIsInstance(p, ReadablePath)
self.assertIsInstance(p, _ReadablePath)
def test_magic_open(self):
p = self.cls(self.base)
@ -1130,7 +1130,7 @@ class ReadablePathTest(JoinablePathTest):
q = p / 'myfile'
self.assertFalse(q.info.exists())
self.assertFalse(q.info.exists(follow_symlinks=False))
if isinstance(self.cls, WritablePath):
if isinstance(self.cls, _WritablePath):
q.write_text('hullo')
self.assertFalse(q.info.exists())
self.assertFalse(q.info.exists(follow_symlinks=False))
@ -1162,7 +1162,7 @@ class ReadablePathTest(JoinablePathTest):
q = p / 'mydir'
self.assertFalse(q.info.is_dir())
self.assertFalse(q.info.is_dir(follow_symlinks=False))
if isinstance(self.cls, WritablePath):
if isinstance(self.cls, _WritablePath):
q.mkdir()
self.assertFalse(q.info.is_dir())
self.assertFalse(q.info.is_dir(follow_symlinks=False))
@ -1194,7 +1194,7 @@ class ReadablePathTest(JoinablePathTest):
q = p / 'myfile'
self.assertFalse(q.info.is_file())
self.assertFalse(q.info.is_file(follow_symlinks=False))
if isinstance(self.cls, WritablePath):
if isinstance(self.cls, _WritablePath):
q.write_text('hullo')
self.assertFalse(q.info.is_file())
self.assertFalse(q.info.is_file(follow_symlinks=False))
@ -1220,7 +1220,7 @@ class WritablePathTest(JoinablePathTest):
def test_is_writable(self):
p = self.cls(self.base)
self.assertIsInstance(p, WritablePath)
self.assertIsInstance(p, _WritablePath)
class DummyRWPath(DummyWritablePath, DummyReadablePath):