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:35 +0100
committerErik Johnston <erik@matrix.org>2015-10-16 15:35:35 +0100
commit33646eb000e99abd4d9174276b105a4d0f00cfef (patch)
tree903158f9fd9ae20e1b025f3e974ec40f132fa276 /synapse/storage
parentRemove unused import (diff)
parentMerge pull request #311 from matrix-org/markjh/postgres_fixes (diff)
downloadsynapse-33646eb000e99abd4d9174276b105a4d0f00cfef.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
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")