diff --git a/Lib/tarfile.py b/Lib/tarfile.py index d686435d90ad1b..686b2a24f2d803 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1930,13 +1930,18 @@ 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: members = self for tarinfo in members: if verbose: - _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(): diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 213932069201b9..c27bd88617b16f 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -302,11 +302,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 = ( + (r'\?', 'rw-r--r--', '7011'), ('-', 'rw-r--r--', '7011'), + ('d', 'rwxr-xr-x', '0'), ('d', 'rwxr-xr-x', '255'), + (r'\?', 'rw-r--r--', '0'), ('l', 'rwxrwxrwx', '0'), + ('b', 'rw-rw----', '3,0'), ('c', 'rw-rw-rw-', '1,3'), + ('p', 'rw-r--r--', '0')) + self.assertRegex(out.decode(), ''.join( + [(tp + (r'%s tarfile/tarfile\s+%s ' % (perm, ln) + + r'\d{4}-\d\d-\d\d\s+\d\d:\d\d:\d\d ' + r'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) diff --git a/Misc/NEWS.d/next/Documentation/2022-11-27-03-36-26.gh-issue-87264.kFnZgX.rst b/Misc/NEWS.d/next/Documentation/2022-11-27-03-36-26.gh-issue-87264.kFnZgX.rst new file mode 100644 index 00000000000000..d9e8ba55bc22b2 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2022-11-27-03-36-26.gh-issue-87264.kFnZgX.rst @@ -0,0 +1 @@ +tarfile list() method shows file type correctly instead of as question marks.