Fix pickle and pickletools not closing files

kj7rrv · kj7rrv · commit 50208d4cd676 · 2022-07-05T12:34:50.000-07:00
Closes #85567
diff --git a/Lib/pickle.py b/Lib/pickle.py
@@ -1816,5 +1816,9 @@ 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()
+
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
@@ -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()
diff --git a/Misc/NEWS.d/next/Library/2022-07-05-12-34-47.gh-issue-85567.E2onV2.rst b/Misc/NEWS.d/next/Library/2022-07-05-12-34-47.gh-issue-85567.E2onV2.rst
@@ -0,0 +1,2 @@
+Fix bug where ``pickle`` and ``pickletools`` command line interfaces do not
+close files

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix bug where ``pickle`` and ``pickletools`` command line interfaces do not
	`2`	`+close files`