From 5c061da8e000c6aeca0494d8f674aca2e1ba475c Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Thu, 23 Nov 2017 09:46:55 -0600 Subject: [PATCH] Move the majority of the csv_header functionality to SpeedtestResults --- speedtest.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/speedtest.py b/speedtest.py index 886c839..5eb3841 100755 --- a/speedtest.py +++ b/speedtest.py @@ -929,6 +929,17 @@ class SpeedtestResults(object): 'client': self.client, } + @staticmethod + def csv_header(delimiter=','): + """Return CSV Headers""" + + row = ['Server ID', 'Sponsor', 'Server Name', 'Timestamp', 'Distance', + 'Ping', 'Download', 'Upload', 'Share', 'IP Address'] + out = StringIO() + writer = csv.writer(out, delimiter=delimiter, lineterminator='') + writer.writerow([to_utf8(v) for v in row]) + return out.getvalue() + def csv(self, delimiter=','): """Return data in CSV format""" @@ -1486,12 +1497,7 @@ def version(): def csv_header(delimiter=','): """Print the CSV Headers""" - row = ['Server ID', 'Sponsor', 'Server Name', 'Timestamp', 'Distance', - 'Ping', 'Download', 'Upload', 'Share', 'IP Address'] - out = StringIO() - writer = csv.writer(out, delimiter=delimiter, lineterminator='') - writer.writerow([to_utf8(v) for v in row]) - print_(out.getvalue()) + print_(SpeedtestResults.csv_header(delimiter=delimiter)) sys.exit(0)