From 70e6dfd2333295e48dbe24807cf6f0b6ac3643b2 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 10 Feb 2020 19:15:03 +0100 Subject: [PATCH] PICARD-1718: Use NamedTemporaryFile for creating log file --- scripts/picard.in | 8 ++++---- tagger.py.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/picard.in b/scripts/picard.in index 741bb1a4f..d6d7f8897 100644 --- a/scripts/picard.in +++ b/scripts/picard.in @@ -10,13 +10,13 @@ except: # noqa: F722 # with minimum chance to fail. import os import sys - import tempfile + from tempfile import NamedTemporaryFile import traceback trace = traceback.format_exc() try: - (fd, logfile) = tempfile.mkstemp(".log", "picard-crash-") - os.write(fd, trace.encode(errors="replace")) - os.close(fd) + with NamedTemporaryFile(suffix='.log', prefix='picard-crash-', delete=False) as f: + f.write(trace.encode(errors="replace")) + logfile = f.name except: # noqa: F722 print("Failed writing log file {0}".format(logfile), file=sys.stderr) logfile = None diff --git a/tagger.py.in b/tagger.py.in index 34270d288..39cbb2548 100644 --- a/tagger.py.in +++ b/tagger.py.in @@ -23,13 +23,13 @@ except SystemExit: except: # noqa: F722 # First try to get traceback information and write it to a log file # with minimum chance to fail. - import tempfile + from tempfile import NamedTemporaryFile import traceback trace = traceback.format_exc() try: - (fd, logfile) = tempfile.mkstemp(".log", "picard-crash-") - os.write(fd, trace.encode(errors="replace")) - os.close(fd) + with NamedTemporaryFile(suffix='.log', prefix='picard-crash-', delete=False) as f: + f.write(trace.encode(errors="replace")) + logfile = f.name except: # noqa: F722 print("Failed writing log file {0}".format(logfile), file=sys.stderr) logfile = None