Skip to content

bpo-41395: use context manager to close filetype objects #21702

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

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
7 changes: 4 additions & 3 deletions Lib/pickle.py
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,7 @@ def _test():
parser.print_help()
else:
import pprint
for f in args.pickle_file:
obj = load(f)
pprint.pprint(obj)
for pickle_file in args.pickle_file:
with pickle_file as f:
obj = load(f)
pprint.pprint(obj)
15 changes: 9 additions & 6 deletions Lib/pickletools.py
Original file line number Diff line number Diff line change
Expand Up @@ -2880,11 +2880,14 @@ 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)
with args.pickle_file[0] as pickle_file, args.output as output:
dis(pickle_file, output, None,
args.indentlevel, annotate)
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)
with args.output as output:
for pickle_file in args.pickle_file:
with pickle_file as f:
preamble = args.preamble.format(name=f.name)
output.write(preamble + '\n')
dis(f, args.output, memo, args.indentlevel, annotate)
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -1148,6 +1148,7 @@ Tim Mitchell
Zubin Mithra
Florian Mladitsch
Doug Moen
Amir Mohammadi
Jakub Molinski
Juliette Monsel
Paul Monson
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use context manager to close filetype objects automatically and avoid
ResourceWarning.