Skip to content

gh-74696: Do not change the current working directory in shutil.make_archive() if possible #93160

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 6 commits into from
Jun 22, 2022
Merged

gh-74696: Do not change the current working directory in shutil.make_archive() if possible #93160

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9f680d
gh-74696: Do not change the current working directory in shutil.make_…
serhiy-storchaka May 24, 2022
21cd33d
Add comments for _ARCHIVE_FORMATS and _UNPACK_FORMATS.
serhiy-storchaka May 24, 2022
fb50a41
Update Lib/shutil.py
serhiy-storchaka May 24, 2022
2d497e3
Minor doc tweaks
ambv Jun 21, 2022
1ccb177
Merge branch 'main' into shutil-make_archive-chdir
serhiy-storchaka Jun 22, 2022
927d2d4
Add tests.
serhiy-storchaka Jun 22, 2022
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
Add comments for _ARCHIVE_FORMATS and _UNPACK_FORMATS.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 24, 2022
commit 21cd33d4917456cf53b315ba6651d8c6970bc6a6
10 changes: 10 additions & 0 deletions Lib/shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,11 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0,
zip_filename = os.path.abspath(zip_filename)
return zip_filename

# Maps the name of the archive format to a tuple containing:
# * the archiving function
# * extra keyword arguments
# * description
# * does it support the root_dir argument?
_ARCHIVE_FORMATS = {
Comment thread
merwok marked this conversation as resolved.
'tar': (_make_tarball, [('compress', None)],
"uncompressed tar file", True),
Expand Down Expand Up @@ -1238,6 +1243,11 @@ def _unpack_tarfile(filename, extract_dir):
finally:
tarobj.close()

# Maps the name of the archive format to a tuple containing:
Comment thread
serhiy-storchaka marked this conversation as resolved.
Outdated
# * extensions
# * the unpacking function
# * extra keyword arguments
# * description
_UNPACK_FORMATS = {
'tar': (['.tar'], _unpack_tarfile, [], "uncompressed tar file"),
'zip': (['.zip'], _unpack_zipfile, [], "ZIP file"),
Expand Down