mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

pathlib ABCs: tighten up resolve() and absolute() (#126611)

Browse source 
In `PathBase.resolve()`, raise `UnsupportedOperation` if a non-POSIX path
parser is used (our implementation uses `posixpath._realpath()`, which
produces incorrect results for non-POSIX path flavours.) Also tweak code to
call `self.absolute()` upfront rather than supplying an emulated `getcwd()`
function.

Adjust `PathBase.absolute()` to work somewhat like `resolve()`. If a POSIX
path parser is used, we treat the root directory as the current directory.
This is the simplest useful behaviour for concrete path types without a
current directory cursor.
This commit is contained in:
Barney Gale 2024-11-09 18:47:49 +00:00 • committed by GitHub
parent 0f47a3199c
commit 266328552e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -861,6 +861,28 @@ class PathTest(test_pathlib_abc.DummyPathTest, PurePathTest):
def test_move_into_empty_name_other_os(self):
self.test_move_into_empty_name()
def _check_complex_symlinks(self, link0_target):
super()._check_complex_symlinks(link0_target)
P = self.cls(self.base)
# Resolve relative paths.
old_path = os.getcwd()
os.chdir(self.base)
try:
p = self.cls('link0').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link1').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link2').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link3').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
finally:
os.chdir(old_path)
def test_resolve_nonexist_relative_issue38671(self):
p = self.cls('non', 'exist')

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

@ -2493,6 +2493,23 @@ class DummyPathTest(DummyPurePathTest):
bad_link.symlink_to("bad" * 200)
self.assertEqual(sorted(base.glob('**/*')), [bad_link])
@needs_posix
def test_absolute_posix(self):
P = self.cls
# The default implementation uses '/' as the current directory
self.assertEqual(str(P('').absolute()), '/')
self.assertEqual(str(P('a').absolute()), '/a')
self.assertEqual(str(P('a/b').absolute()), '/a/b')
self.assertEqual(str(P('/').absolute()), '/')
self.assertEqual(str(P('/a').absolute()), '/a')
self.assertEqual(str(P('/a/b').absolute()), '/a/b')
# '//'-prefixed absolute path (supported by POSIX).
self.assertEqual(str(P('//').absolute()), '//')
self.assertEqual(str(P('//a').absolute()), '//a')
self.assertEqual(str(P('//a/b').absolute()), '//a/b')
@needs_symlinks
def test_readlink(self):
P = self.cls(self.base)
@ -2810,29 +2827,6 @@ class DummyPathTest(DummyPurePathTest):
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
# Resolve relative paths.
try:
self.cls('').absolute()
except UnsupportedOperation:
return
old_path = os.getcwd()
os.chdir(self.base)
try:
p = self.cls('link0').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link1').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link2').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
p = self.cls('link3').resolve()
self.assertEqual(p, P)
self.assertEqualNormCase(str(p), self.base)
finally:
os.chdir(old_path)
@needs_symlinks
def test_complex_symlinks_absolute(self):
self._check_complex_symlinks(self.base)