From d60b00038443fa065d43a9e233c1ef14044d44c0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 14 Aug 2017 14:53:08 +0200 Subject: [PATCH] specify text mode for NamedTemporaryFile Signed-off-by: Paolo Bonzini --- avocado/plugins/diff.py | 9 ++++++--- selftests/unit/test_datadir.py | 2 +- selftests/unit/test_settings.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/avocado/plugins/diff.py b/avocado/plugins/diff.py index b634e7a5..7318d836 100644 --- a/avocado/plugins/diff.py +++ b/avocado/plugins/diff.py @@ -201,14 +201,16 @@ class Diff(CLICmd): if getattr(args, 'create_reports', False): self.std_diff_output = False prefix = 'avocado_diff_%s_' % job1_id[:7] - tmp_file1 = tempfile.NamedTemporaryFile(prefix=prefix, + tmp_file1 = tempfile.NamedTemporaryFile(mode='w', + prefix=prefix, suffix='.txt', delete=False) tmp_file1.writelines(job1_results) tmp_file1.close() prefix = 'avocado_diff_%s_' % job2_id[:7] - tmp_file2 = tempfile.NamedTemporaryFile(prefix=prefix, + tmp_file2 = tempfile.NamedTemporaryFile(mode='w', + prefix=prefix, suffix='.txt', delete=False) tmp_file2.writelines(job2_results) @@ -220,7 +222,8 @@ class Diff(CLICmd): getattr(args, 'html', None) is None): prefix = 'avocado_diff_%s_%s_' % (job1_id[:7], job2_id[:7]) - tmp_file = tempfile.NamedTemporaryFile(prefix=prefix, + tmp_file = tempfile.NamedTemporaryFile(mode='w', + prefix=prefix, suffix='.html', delete=False) diff --git a/selftests/unit/test_datadir.py b/selftests/unit/test_datadir.py index c482306a..39e5c859 100644 --- a/selftests/unit/test_datadir.py +++ b/selftests/unit/test_datadir.py @@ -28,7 +28,7 @@ class DataDirTest(unittest.TestCase): 'test_dir = %(test_dir)s\n' 'data_dir = %(data_dir)s\n' 'logs_dir = %(logs_dir)s\n') % mapping - config_file = tempfile.NamedTemporaryFile(delete=False) + config_file = tempfile.NamedTemporaryFile('w', delete=False) config_file.write(temp_settings) config_file.close() return (mapping, config_file.name) diff --git a/selftests/unit/test_settings.py b/selftests/unit/test_settings.py index 67418177..fecc6c50 100644 --- a/selftests/unit/test_settings.py +++ b/selftests/unit/test_settings.py @@ -19,7 +19,7 @@ home_path = ~ class SettingsTest(unittest.TestCase): def setUp(self): - self.config_file = tempfile.NamedTemporaryFile(delete=False) + self.config_file = tempfile.NamedTemporaryFile('w', delete=False) self.config_file.write(example_1) self.config_file.close() self.settings = settings.Settings(self.config_file.name) -- GitLab