From f3383858c3f674d27556ea6dda32a24f1c503b76 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Wed, 7 Apr 2021 12:31:34 +0100 Subject: [PATCH] commodity.py: Use 'with' for output file. --- commodity.py | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/commodity.py b/commodity.py index 5d2c2dd4..c82313f1 100644 --- a/commodity.py +++ b/commodity.py @@ -44,27 +44,30 @@ def export(data, kind=COMMODITY_DEFAULT, filename=None) -> None: rowheader = sep.join((data['lastSystem']['name'], data['lastStarport']['name'])) - h = open(filename, 'wt') # codecs can't automatically handle line endings, so encode manually where required - h.write(header) + with open(filename, 'wt') as h: # codecs can't automatically handle line endings, so encode manually where required + h.write(header) - for commodity in data['lastStarport']['commodities']: - line = sep.join(( - rowheader, - commodity['name'], - commodity['sellPrice'] and str(int(commodity['sellPrice'])) or '', - commodity['buyPrice'] and str(int(commodity['buyPrice'])) or '', - str(int(commodity['demand'])) if commodity['demandBracket'] else '', - bracketmap[commodity['demandBracket']], - str(int(commodity['stock'])) if commodity['stockBracket'] else '', - bracketmap[commodity['stockBracket']] - )) + for commodity in data['lastStarport']['commodities']: + line = sep.join(( + rowheader, + commodity['name'], + commodity['sellPrice'] and str(int(commodity['sellPrice'])) or '', + commodity['buyPrice'] and str(int(commodity['buyPrice'])) or '', + str(int(commodity['demand'])) if commodity['demandBracket'] else '', + bracketmap[commodity['demandBracket']], + str(int(commodity['stock'])) if commodity['stockBracket'] else '', + bracketmap[commodity['stockBracket']] + )) - if kind == COMMODITY_DEFAULT: - line = sep.join((line, str(int(commodity['meanPrice'])), str(commodity['id']), data['timestamp'] + '\n')) + if kind == COMMODITY_DEFAULT: + line = sep.join(( + line, + str(int(commodity['meanPrice'])), + str(commodity['id']), + data['timestamp'] + '\n') + ) - else: - line = sep.join((line, data['timestamp'] + '\n')) + else: + line = sep.join((line, data['timestamp'] + '\n')) - h.write(line) - - h.close() + h.write(line)