diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-01-29 14:15:12 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-01-29 14:15:12 +0000 |
commit | 47374a33fc195bf44363006070268fd60ffff047 (patch) | |
tree | ea2931512014f5f7361bee5c7f768506adbf783a /synapse/api | |
parent | Add config option for setting the trusted id servers, disabling checking the ... (diff) | |
parent | Bump AccountDataAndTagsChangeCache size (diff) | |
download | synapse-47374a33fc195bf44363006070268fd60ffff047.tar.xz |
Merge remote-tracking branch 'origin/develop' into markjh/3pid
Diffstat (limited to '')
-rw-r--r-- | synapse/api/filtering.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 6c13ada5df..6eff83e5f8 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -15,6 +15,8 @@ from synapse.api.errors import SynapseError from synapse.types import UserID, RoomID +import ujson as json + class Filtering(object): @@ -149,6 +151,9 @@ class FilterCollection(object): "include_leave", False ) + def __repr__(self): + return "<FilterCollection %s>" % (json.dumps(self._filter_json),) + def get_filter_json(self): return self._filter_json |