mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 11:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-87264: Convert tarinfo type to stat type (GH-113230)

Browse source 
Co-authored-by: val-shkolnikov <val@nvsoft.net>
This commit is contained in:
Marat Idrisov 2023-12-19 22:04:43 +03:00 • committed by GitHub
parent 6a1d5a4c0f
commit e1117cb886
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/tarfile.py
View file

@ -2106,6 +2106,10 @@ class TarFile(object):
output is produced. `members' is optional and must be a subset of the output is produced. `members' is optional and must be a subset of the
list returned by getmembers(). 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() self._check()
if members is None: if members is None:
@ -2115,7 +2119,8 @@ class TarFile(object):
if tarinfo.mode is None: if tarinfo.mode is None:
_safe_print("??????????") _safe_print("??????????")
else: 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, _safe_print("%s/%s" % (tarinfo.uname or tarinfo.uid,
tarinfo.gname or tarinfo.gid)) tarinfo.gname or tarinfo.gid))
if tarinfo.ischr() or tarinfo.isblk(): if tarinfo.ischr() or tarinfo.isblk():

20
Lib/test/test_tarfile.py
View file

@ -323,11 +323,23 @@ class ListTest(ReadTest, unittest.TestCase):
# accessories if verbose flag is being used # 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/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 ' # Array of values to modify the regex below:
br'ustar/\w+type ?\r?\n') * 2) # ((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 # Make sure it prints the source of link with verbose flag
self.assertIn(b'ustar/symtype -> regtype', out) self.assertIn(b'ustar/symtype -> regtype', out)
self.assertIn(b'./ustar/linktest2/symtype -> ../linktest1/regtype', out) self.assertIn(b'./ustar/linktest2/symtype -> ../linktest1/regtype', out)

1
Misc/NEWS.d/next/Library/2023-12-17-13-56-30.gh-issue-87264.RgfHCv.rst Normal file
View file

@ -0,0 +1 @@
Fixed tarfile list() method to show file type.