summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-16 15:35:26 +0100
committerErik Johnston <erik@matrix.org>2015-10-16 15:35:26 +0100
commit524b708f98b774fda49d570923cc62105fe0fa45 (patch)
treeda6f4382ca073e517319a1c2098806c83eeac8f9 /synapse/storage
parentMerge pull request #302 from matrix-org/daniel/3pidinvites (diff)
parentFix FilteringStore.get_user_filter to work with postgres (diff)
downloadsynapse-524b708f98b774fda49d570923cc62105fe0fa45.tar.xz
Merge pull request #311 from matrix-org/markjh/postgres_fixes
Fix FilteringStore.get_user_filter to work with postgres
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/filtering.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/filtering.py b/synapse/storage/filtering.py
index 700da8d8c3..fcd43c7fdd 100644
--- a/synapse/storage/filtering.py
+++ b/synapse/storage/filtering.py
@@ -34,7 +34,7 @@ class FilteringStore(SQLBaseStore):
             desc="get_user_filter",
         )
 
-        defer.returnValue(json.loads(def_json.decode("utf-8")))
+        defer.returnValue(json.loads(str(def_json).decode("utf-8")))
 
     def add_user_filter(self, user_localpart, user_filter):
         def_json = json.dumps(user_filter).encode("utf-8")