summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Krogh <markus@nordu.net>2018-12-17 16:02:11 +0100
committerMarkus Krogh <markus@nordu.net>2018-12-17 16:02:11 +0100
commitd1f2def1ea81a6971f1c72353551ac459ab87138 (patch)
treee22233a9c0d80e6352260928da7e858480a37877
parent0ad6b3c8aae9905e3adf16d27f9e4534af7a6bcb (diff)
Python 3.5 support
-rw-r--r--acp-storage-report.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/acp-storage-report.py b/acp-storage-report.py
index ff58abf..51d6faa 100644
--- a/acp-storage-report.py
+++ b/acp-storage-report.py
@@ -33,7 +33,10 @@ def extract_data(data, when, included_space, price_per_gb):
def get_data(when, who, influx_base):
query = influx_query.format(when, when, who)
with request.urlopen(influx_base + parse.urlencode([('q', query)])) as f:
- data = json.loads(f.read())
+ tmp = f.read()
+ if isinstance(tmp, bytes):
+ tmp = tmp.decode('utf-8')
+ data = json.loads(tmp)
return data