bpo-40105: Truncating file if opened in append mode. #19337

mzr · 2020-04-03T16:06:42Z

Implemented a test for this behaviour.

If we just truncate the test fails for Unseekable file types. In current implementation, those type of files can't be opened in the append ('a') mode anyway, so we could make a check for that in the future.

https://bugs.python.org/issue40105

the-knights-who-say-ni · 2020-04-03T16:06:46Z

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@mzr

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

taleinat

This looks good! Just a couple of minor comments regarding the test.

taleinat · 2020-09-26T09:55:59Z

Lib/test/test_zipfile.py

        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)


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.

taleinat · 2020-09-26T09:56:46Z

Lib/test/test_zipfile.py

+        original_comment = b"original comment that's longer"
+        one_byte_shorter_comment =  original_comment[:-1]


IMO extracting these to variables makes the test code harder to understand rather than easier. I suggest undoing this change.

bedevere-bot · 2020-09-26T10:00:35Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

…er comment

mzr · 2020-09-28T16:20:21Z

I have made the requested changes; please review again.

bedevere-bot · 2020-09-28T16:20:25Z

Thanks for making the requested changes!

@taleinat: please review the changes made to this pull request.

taleinat

Looks good!

miss-islington · 2020-09-28T18:53:36Z

Thanks @mzr for the PR, and @taleinat for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

…onGH-19337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

bedevere-bot · 2020-09-28T18:54:06Z

GH-22436 is a backport of this pull request to the 3.9 branch.

…onGH-19337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

bedevere-bot · 2020-09-28T18:54:14Z

GH-22437 is a backport of this pull request to the 3.8 branch.

…9337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

miss-islington · 2020-09-28T19:56:17Z

Thanks @mzr for the PR, and @taleinat for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

…onGH-19337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

bedevere-bot · 2020-09-28T19:56:34Z

GH-22439 is a backport of this pull request to the 3.9 branch.

…9337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

* origin/master: (113 commits) bpo-41773: Raise exception for non-finite weights in random.choices(). (pythonGH-22441) bpo-41873: Add vectorcall for float() (pythonGH-22432) bpo-41861: Convert _sqlite3 PrepareProtocolType to heap type (pythonGH-22428) bpo-41842: Add codecs.unregister() function (pythonGH-22360) bpo-41875: Use __builtin_unreachable when possible (pythonGH-22433) bpo-40105: ZipFile truncate in append mode with shorter comment (pythonGH-19337) bpo-41870: Use PEP 590 vectorcall to speed up bool() (pythonGH-22427) [doc] Leverage the fact that the actual types can now be indexed for typing (pythonGH-22340) bpo-41861: Convert _sqlite3 cache and node static types to heap types (pythonGH-22417) bpo-41858: Clarify line in optparse doc (pythonGH-22407) Revert "Fix all Python Cookbook links (python#22205)" (pythonGH-22424) bpo-1635741: Port _bisect module to multi-phase init (pythonGH-22415) bpo-41428: Fix compiler warning in unionobject.c (pythonGH-22416) Fix logging error message (pythonGH-22410) bpo-39934: Account for control blocks in 'except' in compiler. (pythonGH-22395) bpo-41775: Make 'IDLE Shell' the shell title (python#22399) bpo-41428: Fix compiler warnings in unionobject.c (pythonGH-22388) bpo-41654: Fix compiler warning in MemoryError_dealloc() (pythonGH-22387) bpo-41833: threading.Thread now uses the target name (pythonGH-22357) bpo-30155: Add macros to get tzinfo from datetime instances (pythonGH-21633) ...

…onGH-19337)

Truncating file if opened in append mode.

e76411f

the-knights-who-say-ni added the CLA not signed label Apr 3, 2020

bedevere-bot added the awaiting review label Apr 3, 2020

mzr changed the title ~~Truncating file if opened in append mode.~~ bpo-40105: Truncating file if opened in append mode. Apr 3, 2020

disconnect3d mentioned this pull request Apr 3, 2020

bpo-40105: fixed zip comment update #19333

Closed

blurb-it bot and others added 2 commits April 3, 2020 16:14

📜🤖 Added by blurb_it.

c311362

fix news dos

4f8d7cb

the-knights-who-say-ni added CLA signed and removed CLA not signed labels Apr 7, 2020

csabella requested review from serhiy-storchaka and Yhg1s July 20, 2020 11:40

taleinat requested changes Sep 26, 2020

View reviewed changes

bedevere-bot removed the awaiting review label Sep 26, 2020

bedevere-bot added the awaiting changes label Sep 26, 2020

mzr added 3 commits September 28, 2020 18:12

check whether file whether zipfile was truncated when appending short…

a93382e

…er comment

Merge branch 'master' into zipfile-shorten-comment-test-fix

bdfda09

delete unnecessary whitespace change

55d3b46

bedevere-bot added awaiting change review and removed awaiting changes labels Sep 28, 2020

bedevere-bot requested a review from taleinat September 28, 2020 16:20

slightly reword NEWS entry

198b93b

taleinat approved these changes Sep 28, 2020

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting change review labels Sep 28, 2020

taleinat added needs backport to 3.8 only security fixes needs backport to 3.9 only security fixes labels Sep 28, 2020

taleinat added the type-bug An unexpected behavior, bug, or error label Sep 28, 2020

taleinat merged commit ff9147d into python:master Sep 28, 2020

bedevere-bot removed the awaiting merge label Sep 28, 2020

bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 28, 2020

bedevere-bot removed the needs backport to 3.8 only security fixes label Sep 28, 2020

mzr deleted the zipfile-shorten-comment-fix branch September 28, 2020 19:04

miss-islington added a commit that referenced this pull request Sep 28, 2020

bpo-40105: ZipFile truncate in append mode with shorter comment (GH-1…

e400840

…9337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

taleinat added the needs backport to 3.9 only security fixes label Sep 28, 2020

bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 28, 2020

miss-islington added a commit that referenced this pull request Sep 28, 2020

bpo-40105: ZipFile truncate in append mode with shorter comment (GH-1…

048f54d

…9337) (cherry picked from commit ff9147d) Co-authored-by: Jan Mazur <16736821+mzr@users.noreply.github.com>

xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020

bpo-40105: ZipFile truncate in append mode with shorter comment (pyth…

ef4596e

…onGH-19337)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-40105: Truncating file if opened in append mode. #19337

bpo-40105: Truncating file if opened in append mode. #19337

mzr commented Apr 3, 2020 •

edited by taleinat

Loading

the-knights-who-say-ni commented Apr 3, 2020

taleinat left a comment

taleinat Sep 26, 2020

taleinat Sep 26, 2020

bedevere-bot commented Sep 26, 2020

mzr commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

taleinat left a comment

miss-islington commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

miss-islington commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

		original_comment = b"original comment that's longer"
		one_byte_shorter_comment = original_comment[:-1]

bpo-40105: Truncating file if opened in append mode. #19337

bpo-40105: Truncating file if opened in append mode. #19337

Conversation

mzr commented Apr 3, 2020 • edited by taleinat Loading

the-knights-who-say-ni commented Apr 3, 2020

CLA Missing

taleinat left a comment

Choose a reason for hiding this comment

taleinat Sep 26, 2020

Choose a reason for hiding this comment

taleinat Sep 26, 2020

Choose a reason for hiding this comment

bedevere-bot commented Sep 26, 2020

mzr commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

taleinat left a comment

Choose a reason for hiding this comment

miss-islington commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

miss-islington commented Sep 28, 2020

bedevere-bot commented Sep 28, 2020

mzr commented Apr 3, 2020 •

edited by taleinat

Loading