Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[3.8] gh-102950: Implement PEP 706 – Filter for tarfile.extractall (GH-102953) #104548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambv merged 8 commits into from
May 17, 2023
Merged

[3.8] gh-102950: Implement PEP 706 – Filter for tarfile.extractall (GH-102953) #104548

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4556de
Implement PEP 706 – Filter for tarfile.extractall
encukou Jan 31, 2023
c737a47
Downgrade to Python 3.6
encukou May 16, 2023
6da78bf
Remove the DeprecationWarning
encukou Apr 25, 2023
57b003a
Remove new __all__ entries
encukou Apr 25, 2023
cabcaf2
gh-102950: Adjust tarfile filter tests for systems that don't set the…
encukou Apr 25, 2023
4a17b3d
Skip chmod checking on Windows
encukou May 9, 2023
3e2c2f9
Adjust the docs for 3.9.17
encukou Apr 25, 2023
f755ecd
Backport warning to shutil.unpack_archive docs
encukou May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gh-102950: Adjust tarfile filter tests for systems that don't set the… 
… sticky bit (GH-103831)

Also remove expilcit `type=tarfile.DIRTYPE`, the slash at the end is
enough.

Backport of c8c3956
  • Loading branch information
@encukou
encukou committed May 16, 2023
commit cabcaf27ebf5c2051a8ed45e8c5ebfbf2d123080
30 changes: 25 additions & 5 deletions Lib/test/test_tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3288,23 +3288,43 @@ def test_modes(self):
arc.add('exec_group_other', mode='?rw-rwxrwx')
arc.add('read_group_only', mode='?---r-----')
arc.add('no_bits', mode='?---------')
arc.add('dir/', mode='?---rwsrwt', type=tarfile.DIRTYPE)
arc.add('dir/', mode='?---rwsrwt')

# On some systems, setting the sticky bit is a no-op.
# Check if that's the case.
tmp_filename = os.path.join(TEMPDIR, "tmp.file")
with open(tmp_filename, 'w'):
pass
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
have_sticky_files = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
os.unlink(tmp_filename)

os.mkdir(tmp_filename)
os.chmod(tmp_filename, os.stat(tmp_filename).st_mode | stat.S_ISVTX)
have_sticky_dirs = (os.stat(tmp_filename).st_mode & stat.S_ISVTX)
os.rmdir(tmp_filename)

with self.check_context(arc.open(), 'fully_trusted'):
self.expect_file('all_bits', mode='?rwsrwsrwt')
if have_sticky_files:
self.expect_file('all_bits', mode='?rwsrwsrwt')
else:
self.expect_file('all_bits', mode='?rwsrwsrwx')
self.expect_file('perm_bits', mode='?rwxrwxrwx')
self.expect_file('exec_group_other', mode='?rw-rwxrwx')
self.expect_file('read_group_only', mode='?---r-----')
self.expect_file('no_bits', mode='?---------')
self.expect_file('dir', type=tarfile.DIRTYPE, mode='?---rwsrwt')
if have_sticky_dirs:
self.expect_file('dir/', mode='?---rwsrwt')
else:
self.expect_file('dir/', mode='?---rwsrwx')

with self.check_context(arc.open(), 'tar'):
self.expect_file('all_bits', mode='?rwxr-xr-x')
self.expect_file('perm_bits', mode='?rwxr-xr-x')
self.expect_file('exec_group_other', mode='?rw-r-xr-x')
self.expect_file('read_group_only', mode='?---r-----')
self.expect_file('no_bits', mode='?---------')
self.expect_file('dir/', type=tarfile.DIRTYPE, mode='?---r-xr-x')
self.expect_file('dir/', mode='?---r-xr-x')

with self.check_context(arc.open(), 'data'):
normal_dir_mode = stat.filemode(stat.S_IMODE(
Expand All @@ -3314,7 +3334,7 @@ def test_modes(self):
self.expect_file('exec_group_other', mode='?rw-r--r--')
self.expect_file('read_group_only', mode='?rw-r-----')
self.expect_file('no_bits', mode='?rw-------')
self.expect_file('dir/', type=tarfile.DIRTYPE, mode=normal_dir_mode)
self.expect_file('dir/', mode=normal_dir_mode)

def test_pipe(self):
# Test handling of a special file
Expand Down