FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-85567: Fix pickle and pickletools not closing files by kj7rrv · Pull Request #94583 · python/cpython · GitHub

/ cpython Public

gh-85567: Fix pickle and pickletools not closing files #94583

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
kj7rrv wants to merge 5 commits into from
+20 −7
Conversation 2 Commits 5 Checks 0 Files changed 3
Closed

gh-85567: Fix pickle and pickletools not closing files #94583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50208d4
Fix pickle and pickletools not closing files
kj7rrv Jul 5, 2022
ed65ed7
Merge branch 'main' into pickle-close-files
kj7rrv Jul 5, 2022
e43b831
Fix whitespace
kj7rrv Jul 5, 2022
a7ba2e6
Merge branch 'pickle-close-files' of https://github.com/kj7rrv/cpytho…
kj7rrv Jul 5, 2022
418c6d3
Merge branch 'main' into pickle-close-files
kj7rrv Jul 6, 2022
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
7 changes: 5 additions & 2 deletions Lib/pickle.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1816,5 +1816,8 @@ def _test():
else:
import pprint
for f in args.pickle_file:
obj = load(f)
pprint.pprint(obj)
try:
obj = load(f)
pprint.pprint(obj)
finally:
f.close()
18 changes: 13 additions & 5 deletions Lib/pickletools.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2880,11 +2880,19 @@ def _test():
if not args.pickle_file:
parser.print_help()
elif len(args.pickle_file) == 1:
dis(args.pickle_file[0], args.output, None,
args.indentlevel, annotate)
try:
dis(args.pickle_file[0], args.output, None,
args.indentlevel, annotate)
finally:
args.pickle_file[0].close()
args.output.close()
else:
memo = {} if args.memo else None
for f in args.pickle_file:
preamble = args.preamble.format(name=f.name)
args.output.write(preamble + '\n')
dis(f, args.output, memo, args.indentlevel, annotate)
try:
preamble = args.preamble.format(name=f.name)
args.output.write(preamble + '\n')
dis(f, args.output, memo, args.indentlevel, annotate)
finally:
f.close()
args.output.close()

serhiy-storchaka Jan 1, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

It is not correct to close the output file after processing the first input file.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2022-07-05-12-34-47.gh-issue-85567.E2onV2.rst
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix bug where ``pickle`` and ``pickletools`` command line interfaces do not
close files
Back | FazBrowse Home | New Git URL