Skip to content

bpo-24132: Add direct subclassing of PurePath/Path in pathlib #26906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kfollstad wants to merge 7 commits into from
Closed

bpo-24132: Add direct subclassing of PurePath/Path in pathlib #26906

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
710f577
bpo-24132: Add tests for class properties in pathlib's PurePath/Path
kfollstad Jun 11, 2021
a373969
bpo-24132: Add test for direct subclassing of PurePath/Path in pathlib
kfollstad Jun 14, 2021
35d8f78
bpo-24132: Fix inconsistent organization of is_mount in pathlib
kfollstad May 27, 2021
bab67b4
bpo-24132: Replace additional hardcoded references in pathlib
kfollstad May 3, 2021
67faae0
bpo-24132: Replace factory functionality with masquerade in pathlib
kfollstad Jun 14, 2021
610f41e
bpo-24132: Add tests for comparing subclasses of PurePath in pathlib
kfollstad Jun 17, 2021
a0c4998
bpo-24132: Document direct subclassing of PurePath/Path in pathlib
kfollstad Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-24132: Add tests for class properties in pathlib's PurePath/Path 
Add tests to verify previously untested black-box class properties of
PurePath and Path in pathlib. Collectively, these tests verify all the
ways the classes represent themselves via isinstance, issubclass,
__repr__(), etc. Moreover all class instances spawned by PurePath or
Path are also similarly tested.
  • Loading branch information
@kfollstad
kfollstad committed Jun 24, 2021
commit 710f5778302dbe4363a0e9a8b187275d6c1bc47c
80 changes: 69 additions & 11 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,13 +1296,50 @@ def test_is_reserved(self):
# UNC paths are never reserved.
self.assertIs(False, P('//my/share/nul/con/aux').is_reserved())

class PurePathTest(_BasePurePathTest, unittest.TestCase):

class _PathPurePathCommonTest:
def assertClassProperties(self, instances, correct_cls):
_instances = instances if hasattr(instances, '__iter__') else [instances]
for instance in _instances:
self.assertEqual(instance.__class__, correct_cls)
self.assertEqual(
instance.__repr__(),
f"{correct_cls.__name__}('{instance.as_posix()}')"
)
self.assertTrue(isinstance(instance, correct_cls))
self.assertTrue(isinstance(instance, self.cls))
self.assertTrue(issubclass(instance.__class__, correct_cls))
self.assertTrue(issubclass(instance.__class__, self.cls))
self.assertTrue(type(instance), correct_cls)

def assertNonIONewInstancesClassProperties(self, instance, correct_cls):
self.assertClassProperties(instance.with_name('new_name'), correct_cls)
self.assertClassProperties(instance.with_stem('new_name2'),
correct_cls)
self.assertClassProperties(instance.with_suffix('.ext'), correct_cls)
self.assertClassProperties(
instance.relative_to(instance.drive, instance.root), correct_cls
)
self.assertClassProperties(instance.joinpath('.'), correct_cls)
self.assertClassProperties(instance.parents, correct_cls)
self.assertClassProperties(instance / "subdir", correct_cls)
self.assertClassProperties("" / instance, correct_cls)


class PurePathTest(
_BasePurePathTest, _PathPurePathCommonTest, unittest.TestCase
):
cls = pathlib.PurePath

def test_concrete_class(self):
p = self.cls('a')
self.assertIs(type(p),
pathlib.PureWindowsPath if os.name == 'nt' else pathlib.PurePosixPath)
def _get_class_to_generate(self):
is_posix = os.name == 'posix'
return pathlib.PurePosixPath if is_posix else pathlib.PureWindowsPath

def test_instance_class_properties(self):
p = self.cls('placeholder')
correct_cls = self._get_class_to_generate()
self.assertClassProperties(p, correct_cls)
self.assertNonIONewInstancesClassProperties(p, correct_cls)

def test_different_flavours_unequal(self):
p = pathlib.PurePosixPath('a')
Expand Down Expand Up @@ -2414,17 +2451,38 @@ def test_complex_symlinks_relative_dot_dot(self):
self._check_complex_symlinks(os.path.join('dirA', '..'))


class PathTest(_BasePathTest, unittest.TestCase):
class PathTest(_BasePathTest, _PathPurePathCommonTest, unittest.TestCase):
cls = pathlib.Path

def _get_class_to_generate(self):
is_posix = os.name == 'posix'
return pathlib.PosixPath if is_posix else pathlib.WindowsPath

def assertIONoLinkNewInstancesClassProperties(self, instance, correct_cls):
self.assertClassProperties(instance.cwd(), correct_cls)
self.assertClassProperties(instance.home(), correct_cls)
self.assertClassProperties(instance.iterdir(), correct_cls)
self.assertClassProperties(instance.glob('*'), correct_cls)
self.assertClassProperties(instance.rglob('*'), correct_cls)
self.assertClassProperties(instance.absolute(), correct_cls)
self.assertClassProperties(instance.resolve(strict=False), correct_cls)
self.assertClassProperties(instance.expanduser(), correct_cls)
self.assertClassProperties(instance.replace(BASE), correct_cls)

def test_instance_class_properties(self):
P = self.cls
p = P(BASE)
correct_cls = self._get_class_to_generate()
self.assertClassProperties(p, correct_cls)
self.assertNonIONewInstancesClassProperties(p, correct_cls)
self.assertIONoLinkNewInstancesClassProperties(p, correct_cls)
if os_helper.can_symlink():
link = P(BASE, "linkA")
self.assertClassProperties(link.readlink(), correct_cls)

def test_class_getitem(self):
self.assertIs(self.cls[str], self.cls)

def test_concrete_class(self):
p = self.cls('a')
self.assertIs(type(p),
pathlib.WindowsPath if os.name == 'nt' else pathlib.PosixPath)

def test_unsupported_flavour(self):
if os.name == 'nt':
self.assertRaises(NotImplementedError, pathlib.PosixPath)
Expand Down