From 8ef94788794688e01f745b3a76fc3104ebb79cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 4 May 2016 15:28:36 +0200 Subject: [PATCH] [discinfo] Use context manager for file access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/compose_metadata/discinfo.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pungi/compose_metadata/discinfo.py b/pungi/compose_metadata/discinfo.py index fe74fca7..0042015e 100644 --- a/pungi/compose_metadata/discinfo.py +++ b/pungi/compose_metadata/discinfo.py @@ -45,23 +45,22 @@ def write_discinfo(file_path, description, arch, disc_numbers=None, timestamp=No raise TypeError("Invalid type: disc_numbers type is %s; expected: " % type(disc_numbers)) if not timestamp: timestamp = "%f" % time.time() - f = open(file_path, "w") - f.write("%s\n" % timestamp) - f.write("%s\n" % description) - f.write("%s\n" % arch) - if disc_numbers: - f.write("%s\n" % ",".join([str(i) for i in disc_numbers])) - f.close() + with open(file_path, "w") as f: + f.write("%s\n" % timestamp) + f.write("%s\n" % description) + f.write("%s\n" % arch) + if disc_numbers: + f.write("%s\n" % ",".join([str(i) for i in disc_numbers])) return timestamp def read_discinfo(file_path): result = {} - f = open(file_path, "r") - result["timestamp"] = f.readline().strip() - result["description"] = f.readline().strip() - result["arch"] = f.readline().strip() - disc_numbers = f.readline().strip() + with open(file_path, "r") as f: + result["timestamp"] = f.readline().strip() + result["description"] = f.readline().strip() + result["arch"] = f.readline().strip() + disc_numbers = f.readline().strip() if not disc_numbers: result["disc_numbers"] = None elif disc_numbers == "ALL":