From 472be886740edf5f9eb08f234063a7d57f70442b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 29 Apr 2015 17:43:46 +0100 Subject: We store pusher data as bytes --- synapse/storage/pusher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/storage') diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index feb2870dfe..57690c3ef5 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -53,7 +53,7 @@ class PusherStore(SQLBaseStore): dataJson = r['data'] r['data'] = None try: - r['data'] = json.loads(dataJson) + r['data'] = json.loads(str(dataJson).decode("UTF8")) except: logger.warn("Invalid JSON in data for pusher %d: %s", r['id'], dataJson) pass @@ -81,7 +81,7 @@ class PusherStore(SQLBaseStore): device_display_name=device_display_name, ts=pushkey_ts, lang=lang, - data=encode_canonical_json(data).decode("UTF-8"), + data=encode_canonical_json(data), ), insertion_values=dict( id=next_id, -- cgit 1.4.1