From 85d4c419fd13b72ac0c430082661bae0663f1344 Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Mon, 29 Jul 2019 17:28:47 -0400 Subject: [PATCH] Decode server responses from raw bytes to strings Uses utf-8, or whatever the server response indicates. --- tests/test_nilmdb.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_nilmdb.py b/tests/test_nilmdb.py index aa35dac..b756151 100644 --- a/tests/test_nilmdb.py +++ b/tests/test_nilmdb.py @@ -136,8 +136,9 @@ class TestBlockingServer(object): thread.join() def geturl(path): - req = urlopen("http://127.0.0.1:32180" + path, timeout = 10) - return req.read() + resp = urlopen("http://127.0.0.1:32180" + path, timeout = 10) + body = resp.read() + return body.decode(resp.headers.get_content_charset() or 'utf-8') def getjson(path): return json.loads(geturl(path))