Skip to content

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

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

Closed
encukou wants to merge 13 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f089c53
Implement PEP 706 – Filter for tarfile.extractall
encukou Jan 31, 2023
9106981
Downgrade to Python 3.6
encukou May 16, 2023
3ab896b
Remove the DeprecationWarning
encukou Apr 25, 2023
300a1a8
Backport test.support.check_no_warnings
encukou May 17, 2023
7ea8050
Remove new __all__ entries
encukou Apr 25, 2023
921e5f1
gh-102950: Adjust tarfile filter tests for systems that don't set the…
encukou Apr 25, 2023
fc9913d
Skip chmod checking on Windows
encukou May 9, 2023
a11a198
Adjust the docs for 3.7.17
encukou Apr 25, 2023
8332ea3
Backport warning to shutil.unpack_archive docs
encukou May 16, 2023
b626549
Skip test when an obscure Windows pathlib error appears
encukou May 23, 2023
7ae4a88
Feed a string to os.readlink()
encukou May 23, 2023
64d1a92
Fix syntax error
encukou May 25, 2023
773e47e
Merge branch '3.7' into tarfile-3.7
ned-deily May 27, 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
Downgrade to Python 3.6
  • Loading branch information
@encukou
encukou committed May 17, 2023
commit 9106981373c485e0105f33fe087ae691f32a24bf
3 changes: 2 additions & 1 deletion Lib/shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,8 @@ def unpack_archive(filename, extract_dir=None, format=None, *, filter=None):
raise ReadError("Unknown archive format '{0}'".format(filename))

func = _UNPACK_FORMATS[format][1]
kwargs = dict(_UNPACK_FORMATS[format][2]) | filter_kwargs
kwargs = dict(_UNPACK_FORMATS[format][2])
kwargs.update(filter_kwargs)
func(filename, extract_dir, **kwargs)


Expand Down
3 changes: 1 addition & 2 deletions Lib/test/test_shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

from test import support
from test.support import TESTFN, FakePath
from test.support import warnings_helper

TESTFN2 = TESTFN + "2"

Expand Down Expand Up @@ -1276,7 +1275,7 @@ def check_unpack_archive_with_converter(self, format, converter, **kwargs):
def check_unpack_tarball(self, format):
self.check_unpack_archive(format, filter='fully_trusted')
self.check_unpack_archive(format, filter='data')
with warnings_helper.check_warnings(
with support.check_warnings(
('The default', RuntimeWarning)):
self.check_unpack_archive(format)

Expand Down
12 changes: 5 additions & 7 deletions Lib/test/test_tarfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

from test import support
from test.support import script_helper
from test.support import warnings_helper

# Check for our compression modules.
try:
Expand Down Expand Up @@ -2729,8 +2728,7 @@ def setUpClass(cls):
tar.errorlevel = 0
with ExitStack() as cm:
if cls.extraction_filter is None:
cm.enter_context(warnings.catch_warnings(
action="ignore", category=DeprecationWarning))
cm.enter_context(warnings.catch_warnings())
tar.extractall(cls.control_dir, filter=cls.extraction_filter)
tar.close()
cls.control_paths = set(
Expand Down Expand Up @@ -2860,8 +2858,8 @@ def test_list(self):
for attr_names in ({'mtime'}, {'mode'}, {'uid'}, {'gid'},
{'uname'}, {'gname'},
{'uid', 'uname'}, {'gid', 'gname'}):
with (self.subTest(attr_names=attr_names),
tarfile.open(tarname, encoding="iso8859-1") as tar):
with self.subTest(attr_names=attr_names), \
tarfile.open(tarname, encoding="iso8859-1") as tar:
tio_prev = io.TextIOWrapper(io.BytesIO(), 'ascii', newline='\n')
with support.swap_attr(sys, 'stdout', tio_prev):
tar.list()
Expand Down Expand Up @@ -3052,7 +3050,7 @@ def expect_file(self, name, type=None, symlink_to=None, mode=None):
if type is None and isinstance(name, str) and name.endswith('/'):
type = tarfile.DIRTYPE
if symlink_to is not None:
got = (self.destdir / name).readlink()
got = pathlib.Path(os.readlink(self.destdir / name))
expected = pathlib.Path(symlink_to)
# The symlink might be the same (textually) as what we expect,
# but some systems change the link to an equivalent path, so
Expand Down Expand Up @@ -3369,7 +3367,7 @@ def test_default_filter_warns(self):
"""Ensure the default filter warns"""
with ArchiveMaker() as arc:
arc.add('foo')
with warnings_helper.check_warnings(
with support.check_warnings(
('Python 3.14', DeprecationWarning)):
with self.check_context(arc.open(), None):
self.expect_file('foo')
Expand Down