From a1333e51cd58c69445afbc2c18ededb26f17f60b Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 13 Sep 2017 18:18:29 -0700 Subject: [PATCH] fix unicode/json on py3 --- src/wormhole_transit_relay/test/test_stats.py | 2 +- src/wormhole_transit_relay/transit_server.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wormhole_transit_relay/test/test_stats.py b/src/wormhole_transit_relay/test/test_stats.py index f7a6365..97366af 100644 --- a/src/wormhole_transit_relay/test/test_stats.py +++ b/src/wormhole_transit_relay/test/test_stats.py @@ -9,7 +9,7 @@ class UsageLog(unittest.TestCase): os.mkdir(d) usage_logfile = os.path.join(d, "usage.log") def read(): - with open(usage_logfile, "rb") as f: + with open(usage_logfile, "r") as f: return [json.loads(line) for line in f.readlines()] t = Transit(None, usage_logfile, None) t.recordUsage(started=123, result="happy", total_bytes=100, diff --git a/src/wormhole_transit_relay/transit_server.py b/src/wormhole_transit_relay/transit_server.py index f792aa2..42f19ca 100644 --- a/src/wormhole_transit_relay/transit_server.py +++ b/src/wormhole_transit_relay/transit_server.py @@ -300,7 +300,7 @@ class Transit(protocol.ServerFactory): def _update_stats(self, total_bytes, mood): try: - with open(self._stats_file, "rb") as f: + with open(self._stats_file, "r") as f: stats = json.load(f) except (EnvironmentError, ValueError): stats = {} @@ -332,7 +332,7 @@ class Transit(protocol.ServerFactory): um[m] = 0 um[mood] += 1 tmpfile = self._stats_file + ".tmp" - with open(tmpfile, "wb") as f: + with open(tmpfile, "w") as f: f.write(json.dumps(stats)) f.write("\n") os.rename(tmpfile, self._stats_file)