-
-
Notifications
You must be signed in to change notification settings - Fork 32.1k
bpo-40105: Truncating file if opened in append mode. #19337
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.
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
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e76411f
Truncating file if opened in append mode.
mzr c311362
📜🤖 Added by blurb_it.
blurb-it[bot] 4f8d7cb
fix news dos
mzr a93382e
check whether file whether zipfile was truncated when appending short…
mzr bdfda09
Merge branch 'master' into zipfile-shorten-comment-test-fix
mzr 55d3b46
delete unnecessary whitespace change
mzr 198b93b
slightly reword NEWS entry
taleinat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1808,7 +1808,6 @@ def test_struct_sizes(self): | |
|
||
def test_comments(self): | ||
"""Check that comments on the archive are handled properly.""" | ||
|
||
# check default comment is empty | ||
with zipfile.ZipFile(TESTFN, mode="w") as zipf: | ||
self.assertEqual(zipf.comment, b'') | ||
|
@@ -1853,13 +1852,18 @@ def test_comments(self): | |
self.assertEqual(zipf.comment, b"an updated comment") | ||
|
||
# check that comments are correctly shortened in append mode | ||
# and the file is indeed truncated | ||
original_comment = b"original comment that's longer" | ||
one_byte_shorter_comment = original_comment[:-1] | ||
with zipfile.ZipFile(TESTFN,mode="w") as zipf: | ||
zipf.comment = b"original comment that's longer" | ||
zipf.comment = original_comment | ||
zipf.writestr("foo.txt", "O, for a Muse of Fire!") | ||
original_zip_size = os.path.getsize(TESTFN) | ||
with zipfile.ZipFile(TESTFN,mode="a") as zipf: | ||
zipf.comment = b"shorter comment" | ||
zipf.comment = one_byte_shorter_comment | ||
self.assertEqual(original_zip_size, os.path.getsize(TESTFN) + 1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Testing for the precise size is too restrictive IMO. It would be better to just test that the size was reduced. That would also allow keeping the existing comments. |
||
with zipfile.ZipFile(TESTFN,mode="r") as zipf: | ||
self.assertEqual(zipf.comment, b"shorter comment") | ||
self.assertEqual(zipf.comment, one_byte_shorter_comment) | ||
|
||
def test_unicode_comment(self): | ||
with zipfile.ZipFile(TESTFN, "w", zipfile.ZIP_STORED) as zipf: | ||
|
This file contains hidden or 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
1 change: 1 addition & 0 deletions
1
Misc/NEWS.d/next/Library/2020-04-03-16-13-59.bpo-40105.hfM2c0.rst
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ZipFiles are truncated when shorter comment is provided in append ("a") mode. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO extracting these to variables makes the test code harder to understand rather than easier. I suggest undoing this change.