https://github.com/python/cpython/commit/38264a060a8178d58046e90e9beb8220e3c22046
commit: 38264a060a8178d58046e90e9beb8220e3c22046
branch: main
author: Barney Gale <[email protected]>
committer: barneygale <[email protected]>
date: 2024-11-29T21:03:39Z
summary:
GH-127381: pathlib ABCs: remove `PathBase.lstat()` (#127382)
Remove the `PathBase.lstat()` method, which is a trivial variation of
`stat()`.
No user-facing changes because the pathlib ABCs are still private.
files:
M Lib/pathlib/_abc.py
M Lib/pathlib/_local.py
M Lib/test/test_pathlib/test_pathlib.py
M Lib/test/test_pathlib/test_pathlib_abc.py
diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py
index 2c243d470d4eda..697f32985ff652 100644
--- a/Lib/pathlib/_abc.py
+++ b/Lib/pathlib/_abc.py
@@ -438,14 +438,6 @@ def stat(self, *, follow_symlinks=True):
"""
raise UnsupportedOperation(self._unsupported_msg('stat()'))
- def lstat(self):
- """
- Like stat(), except if the path points to a symlink, the symlink's
- status information is returned, rather than its target's.
- """
- return self.stat(follow_symlinks=False)
-
-
# Convenience functions for querying the stat results
def exists(self, *, follow_symlinks=True):
@@ -505,7 +497,7 @@ def is_symlink(self):
Whether this path is a symbolic link.
"""
try:
- return S_ISLNK(self.lstat().st_mode)
+ return S_ISLNK(self.stat(follow_symlinks=False).st_mode)
except (OSError, ValueError):
return False
@@ -789,7 +781,7 @@ def raise_error(*args):
def lstat(path_str):
path = self.with_segments(path_str)
path._resolving = True
- return path.lstat()
+ return path.stat(follow_symlinks=False)
def readlink(path_str):
path = self.with_segments(path_str)
diff --git a/Lib/pathlib/_local.py b/Lib/pathlib/_local.py
index b27f456d375225..25c1e3f44ea7e8 100644
--- a/Lib/pathlib/_local.py
+++ b/Lib/pathlib/_local.py
@@ -542,6 +542,13 @@ def stat(self, *, follow_symlinks=True):
"""
return os.stat(self, follow_symlinks=follow_symlinks)
+ def lstat(self):
+ """
+ Like stat(), except if the path points to a symlink, the symlink's
+ status information is returned, rather than its target's.
+ """
+ return os.lstat(self)
+
def exists(self, *, follow_symlinks=True):
"""
Whether this path exists.
diff --git a/Lib/test/test_pathlib/test_pathlib.py
b/Lib/test/test_pathlib/test_pathlib.py
index 6a994f890da616..2c48eeeda145d0 100644
--- a/Lib/test/test_pathlib/test_pathlib.py
+++ b/Lib/test/test_pathlib/test_pathlib.py
@@ -546,12 +546,9 @@ def tempdir(self):
self.addCleanup(os_helper.rmtree, d)
return d
- def test_matches_pathbase_api(self):
- our_names = {name for name in dir(self.cls) if name[0] != '_'}
- our_names.remove('is_reserved') # only present in PurePath
+ def test_matches_pathbase_docstrings(self):
path_names = {name for name in dir(pathlib._abc.PathBase) if name[0]
!= '_'}
- self.assertEqual(our_names, path_names)
- for attr_name in our_names:
+ for attr_name in path_names:
if attr_name == 'parser':
# On Windows, Path.parser is ntpath, but PathBase.parser is
# posixpath, and so their docstrings differ.
@@ -1357,6 +1354,17 @@ def test_symlink_to_unsupported(self):
with self.assertRaises(pathlib.UnsupportedOperation):
q.symlink_to(p)
+ @needs_symlinks
+ def test_lstat(self):
+ p = self.cls(self.base)/ 'linkA'
+ st = p.stat()
+ self.assertNotEqual(st, p.lstat())
+
+ def test_lstat_nosymlink(self):
+ p = self.cls(self.base) / 'fileA'
+ st = p.stat()
+ self.assertEqual(st, p.lstat())
+
def test_is_junction(self):
P = self.cls(self.base)
diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py
b/Lib/test/test_pathlib/test_pathlib_abc.py
index aaa30a17f2af14..7ca35e3dc7ee00 100644
--- a/Lib/test/test_pathlib/test_pathlib_abc.py
+++ b/Lib/test/test_pathlib/test_pathlib_abc.py
@@ -1351,7 +1351,6 @@ def test_unsupported_operation(self):
p = self.cls('')
e = UnsupportedOperation
self.assertRaises(e, p.stat)
- self.assertRaises(e, p.lstat)
self.assertRaises(e, p.exists)
self.assertRaises(e, p.samefile, 'foo')
self.assertRaises(e, p.is_dir)
@@ -2671,17 +2670,6 @@ def test_stat_no_follow_symlinks_nosymlink(self):
st = p.stat()
self.assertEqual(st, p.stat(follow_symlinks=False))
- @needs_symlinks
- def test_lstat(self):
- p = self.cls(self.base)/ 'linkA'
- st = p.stat()
- self.assertNotEqual(st, p.lstat())
-
- def test_lstat_nosymlink(self):
- p = self.cls(self.base) / 'fileA'
- st = p.stat()
- self.assertEqual(st, p.lstat())
-
def test_is_dir(self):
P = self.cls(self.base)
self.assertTrue((P / 'dirA').is_dir())
@@ -2868,11 +2856,13 @@ def test_delete_dir(self):
base = self.cls(self.base)
base.joinpath('dirA')._delete()
self.assertRaises(FileNotFoundError, base.joinpath('dirA').stat)
- self.assertRaises(FileNotFoundError, base.joinpath('dirA',
'linkC').lstat)
+ self.assertRaises(FileNotFoundError, base.joinpath('dirA',
'linkC').stat,
+ follow_symlinks=False)
base.joinpath('dirB')._delete()
self.assertRaises(FileNotFoundError, base.joinpath('dirB').stat)
self.assertRaises(FileNotFoundError, base.joinpath('dirB',
'fileB').stat)
- self.assertRaises(FileNotFoundError, base.joinpath('dirB',
'linkD').lstat)
+ self.assertRaises(FileNotFoundError, base.joinpath('dirB',
'linkD').stat,
+ follow_symlinks=False)
base.joinpath('dirC')._delete()
self.assertRaises(FileNotFoundError, base.joinpath('dirC').stat)
self.assertRaises(FileNotFoundError, base.joinpath('dirC',
'dirD').stat)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
