diff options
author | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
commit | 23465a30b65808a75afa5cb98bcd1131a2a2c984 (patch) | |
tree | dcd987034fefbb2649da8346bf36c9d9ded25acc /synapse/api/events | |
parent | Merge branch 'http_client_refactor' into pushers (diff) | |
parent | Fix pep8 codestyle warnings (diff) | |
download | synapse-23465a30b65808a75afa5cb98bcd1131a2a2c984.tar.xz |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/api/events')
-rw-r--r-- | synapse/api/events/__init__.py | 2 | ||||
-rw-r--r-- | synapse/api/events/validator.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index a01c4a1351..8a35b4cb7d 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -83,6 +83,8 @@ class SynapseEvent(JsonEncodedObject): "content", ] + outlier = False + def __init__(self, raises=True, **kwargs): super(SynapseEvent, self).__init__(**kwargs) # if "content" in kwargs: diff --git a/synapse/api/events/validator.py b/synapse/api/events/validator.py index 2d4f2a3aa7..067215f6ef 100644 --- a/synapse/api/events/validator.py +++ b/synapse/api/events/validator.py @@ -84,4 +84,4 @@ class EventValidator(object): template[key][0] ) if msg: - return msg \ No newline at end of file + return msg |