https://github.com/python/cpython/commit/bd754b93ca837aa1f239252437a211271d068b71
commit: bd754b93ca837aa1f239252437a211271d068b71
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-01-06T00:12:34+02:00
summary:
gh-85567: Fix resouce warnings in pickle and pickletools CLIs (GH-113618)
Explicitly open and close files instead of using FileType.
files:
A Misc/NEWS.d/next/Library/2024-01-01-13-26-02.gh-issue-85567.K4U15m.rst
M Lib/pickle.py
M Lib/pickletools.py
diff --git a/Lib/pickle.py b/Lib/pickle.py
index 988c0887341310..33c97c8c5efb28 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -1793,7 +1793,7 @@ def _test():
parser = argparse.ArgumentParser(
description='display contents of the pickle files')
parser.add_argument(
- 'pickle_file', type=argparse.FileType('br'),
+ 'pickle_file',
nargs='*', help='the pickle file')
parser.add_argument(
'-t', '--test', action='store_true',
@@ -1809,6 +1809,10 @@ def _test():
parser.print_help()
else:
import pprint
- for f in args.pickle_file:
- obj = load(f)
+ for fn in args.pickle_file:
+ if fn == '-':
+ obj = load(sys.stdin.buffer)
+ else:
+ with open(fn, 'rb') as f:
+ obj = load(f)
pprint.pprint(obj)
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 95706e746c9870..95a77aeb2afe2a 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -2848,10 +2848,10 @@ def _test():
parser = argparse.ArgumentParser(
description='disassemble one or more pickle files')
parser.add_argument(
- 'pickle_file', type=argparse.FileType('br'),
+ 'pickle_file',
nargs='*', help='the pickle file')
parser.add_argument(
- '-o', '--output', default=sys.stdout, type=argparse.FileType('w'),
+ '-o', '--output',
help='the file where the output should be written')
parser.add_argument(
'-m', '--memo', action='store_true',
@@ -2876,15 +2876,26 @@ def _test():
if args.test:
_test()
else:
- annotate = 30 if args.annotate else 0
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)
else:
+ annotate = 30 if args.annotate else 0
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)
+ if args.output is None:
+ output = sys.stdout
+ else:
+ output = open(args.output, 'w')
+ try:
+ for arg in args.pickle_file:
+ if len(args.pickle_file) > 1:
+ name = '<stdin>' if arg == '-' else arg
+ preamble = args.preamble.format(name=name)
+ output.write(preamble + '\n')
+ if arg == '-':
+ dis(sys.stdin.buffer, output, memo, args.indentlevel,
annotate)
+ else:
+ with open(arg, 'rb') as f:
+ dis(f, output, memo, args.indentlevel, annotate)
+ finally:
+ if output is not sys.stdout:
+ output.close()
diff --git
a/Misc/NEWS.d/next/Library/2024-01-01-13-26-02.gh-issue-85567.K4U15m.rst
b/Misc/NEWS.d/next/Library/2024-01-01-13-26-02.gh-issue-85567.K4U15m.rst
new file mode 100644
index 00000000000000..063443e5aecc02
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-01-01-13-26-02.gh-issue-85567.K4U15m.rst
@@ -0,0 +1,2 @@
+Fix resource warnings for unclosed files in :mod:`pickle` and
+:mod:`pickletools` command line interfaces.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
