gh-99203: shutil.make_archive(): restore select CPython <= 3.10.5 behavior
#99802
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Will look into the failed Windows tests later. |
…10.5 behavior Restore following CPython <= 3.10.5 behavior of `shutil.make_archive()` that went away as part of pythongh-93160: Do not create an empty archive if `root_dir` is not a directory, and, in that case, raise `FileNotFoundError` or `NotADirectoryError` regardless of `format` choice. Beyond the brought-back behavior, the function may now also raise these exceptions in `dry_run` mode.
|
@giampaolo if I'm not mistaken, the P.S.: I acknowledge [1], [2] and won't force-push here any longer, sorry. |
|
Thanks for the review! I addressed the findings. |
6t8k
requested review from
serhiy-storchaka
and removed request for
giampaolo
serhiy-storchaka
approved these changes
Aug 16, 2023
serhiy-storchaka
added
type-bug
|
Thanks @6t8k for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12. |
|
Sorry, @6t8k and @serhiy-storchaka, I could not cleanly backport this to |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Aug 16, 2023
….5 behavior (pythonGH-99802) Restore following CPython <= 3.10.5 behavior of shutil.make_archive() that went away as part of pythongh-93160: Do not create an empty archive if root_dir is not a directory, and, in that case, raise FileNotFoundError or NotADirectoryError regardless of format choice. Beyond the brought-back behavior, the function may now also raise these exceptions in dry_run mode. (cherry picked from commit a86df29) Co-authored-by: 6t8k <58048945+6t8k@users.noreply.github.com>
|
GH-107998 is a backport of this pull request to the 3.12 branch. |
serhiy-storchaka
pushed a commit
to serhiy-storchaka/cpython
that referenced
this pull request
Aug 16, 2023
…<= 3.10.5 behavior (pythonGH-99802) Restore following CPython <= 3.10.5 behavior of shutil.make_archive() that went away as part of pythongh-93160: Do not create an empty archive if root_dir is not a directory, and, in that case, raise FileNotFoundError or NotADirectoryError regardless of format choice. Beyond the brought-back behavior, the function may now also raise these exceptions in dry_run mode.. (cherry picked from commit a86df29) Co-authored-by: 6t8k <58048945+6t8k@users.noreply.github.com>
|
GH-107999 is a backport of this pull request to the 3.11 branch. |
serhiy-storchaka
added a commit
that referenced
this pull request
Aug 16, 2023
…0.5 behavior (GH-99802) (GH-107999) Restore following CPython <= 3.10.5 behavior of shutil.make_archive() that went away as part of gh-93160: Do not create an empty archive if root_dir is not a directory, and, in that case, raise FileNotFoundError or NotADirectoryError regardless of format choice. Beyond the brought-back behavior, the function may now also raise these exceptions in dry_run mode. (cherry picked from commit a86df29) Co-authored-by: 6t8k <58048945+6t8k@users.noreply.github.com>
Yhg1s
pushed a commit
that referenced
this pull request
Aug 16, 2023
…0.5 behavior (GH-99802) (#107998) gh-99203: shutil.make_archive(): restore select CPython <= 3.10.5 behavior (GH-99802) Restore following CPython <= 3.10.5 behavior of shutil.make_archive() that went away as part of gh-93160: Do not create an empty archive if root_dir is not a directory, and, in that case, raise FileNotFoundError or NotADirectoryError regardless of format choice. Beyond the brought-back behavior, the function may now also raise these exceptions in dry_run mode. (cherry picked from commit a86df29) Co-authored-by: 6t8k <58048945+6t8k@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
root_dirdoes not exist, or is not a directory, then CPython >3.10.5 will create an empty archive, so introduce an explicit check for it being a directory.shutil.make_archive()may then raiseFileNotFoundErrororNotADirectoryErrorbefore proceeding to call the internal format-specific archive creation function, as was formerly (implicitly) caused byos.chdir(root_dir), restoring CPython <=3.10.5 behavior._make_tarball()and_make_zipfile()scenario: although the former, unlike the latter, may already causeNotADirectoryErrororFileNotFoundErrorto be raised with respect toroot_dirwithout this proposed change, an empty archive will still be created. On the other hand,_make_zipfile(), is able to create an empty archive while not raising any exceptions, so test it as well, even thoughmake_archive()would otherwise already be covered bytest_make_tarfile_rootdir_nodir(), which runs regardless of zlib availability.