mirror of
https://github.com/python/cpython
synced 2024-09-05 16:38:56 +00:00
gh-87264: Convert tarinfo type to stat type (GH-113230)
Co-authored-by: val-shkolnikov <val@nvsoft.net>
This commit is contained in:
parent
6a1d5a4c0f
commit
e1117cb886
|
@ -2106,6 +2106,10 @@ def list(self, verbose=True, *, members=None):
|
|||
output is produced. `members' is optional and must be a subset of the
|
||||
list returned by getmembers().
|
||||
"""
|
||||
# Convert tarinfo type to stat type.
|
||||
type2mode = {REGTYPE: stat.S_IFREG, SYMTYPE: stat.S_IFLNK,
|
||||
FIFOTYPE: stat.S_IFIFO, CHRTYPE: stat.S_IFCHR,
|
||||
DIRTYPE: stat.S_IFDIR, BLKTYPE: stat.S_IFBLK}
|
||||
self._check()
|
||||
|
||||
if members is None:
|
||||
|
@ -2115,7 +2119,8 @@ def list(self, verbose=True, *, members=None):
|
|||
if tarinfo.mode is None:
|
||||
_safe_print("??????????")
|
||||
else:
|
||||
_safe_print(stat.filemode(tarinfo.mode))
|
||||
modetype = type2mode.get(tarinfo.type, 0)
|
||||
_safe_print(stat.filemode(modetype | tarinfo.mode))
|
||||
_safe_print("%s/%s" % (tarinfo.uname or tarinfo.uid,
|
||||
tarinfo.gname or tarinfo.gid))
|
||||
if tarinfo.ischr() or tarinfo.isblk():
|
||||
|
|
|
@ -323,11 +323,23 @@ def test_list_verbose(self):
|
|||
# accessories if verbose flag is being used
|
||||
# ...
|
||||
# ?rw-r--r-- tarfile/tarfile 7011 2003-01-06 07:19:43 ustar/conttype
|
||||
# ?rw-r--r-- tarfile/tarfile 7011 2003-01-06 07:19:43 ustar/regtype
|
||||
# -rw-r--r-- tarfile/tarfile 7011 2003-01-06 07:19:43 ustar/regtype
|
||||
# drwxr-xr-x tarfile/tarfile 0 2003-01-05 15:19:43 ustar/dirtype/
|
||||
# ...
|
||||
self.assertRegex(out, (br'\?rw-r--r-- tarfile/tarfile\s+7011 '
|
||||
br'\d{4}-\d\d-\d\d\s+\d\d:\d\d:\d\d '
|
||||
br'ustar/\w+type ?\r?\n') * 2)
|
||||
#
|
||||
# Array of values to modify the regex below:
|
||||
# ((file_type, file_permissions, file_length), ...)
|
||||
type_perm_lengths = (
|
||||
(br'\?', b'rw-r--r--', b'7011'), (b'-', b'rw-r--r--', b'7011'),
|
||||
(b'd', b'rwxr-xr-x', b'0'), (b'd', b'rwxr-xr-x', b'255'),
|
||||
(br'\?', b'rw-r--r--', b'0'), (b'l', b'rwxrwxrwx', b'0'),
|
||||
(b'b', b'rw-rw----', b'3,0'), (b'c', b'rw-rw-rw-', b'1,3'),
|
||||
(b'p', b'rw-r--r--', b'0'))
|
||||
self.assertRegex(out, b''.join(
|
||||
[(tp + (br'%s tarfile/tarfile\s+%s ' % (perm, ln) +
|
||||
br'\d{4}-\d\d-\d\d\s+\d\d:\d\d:\d\d '
|
||||
br'ustar/\w+type[/>\sa-z-]*\n')) for tp, perm, ln
|
||||
in type_perm_lengths]))
|
||||
# Make sure it prints the source of link with verbose flag
|
||||
self.assertIn(b'ustar/symtype -> regtype', out)
|
||||
self.assertIn(b'./ustar/linktest2/symtype -> ../linktest1/regtype', out)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fixed tarfile list() method to show file type.
|
Loading…
Reference in a new issue