diff options
| author | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2014-12-18 15:15:22 +0000 |
| commit | b56730bb6e549e6b22c95858cae50e091de96844 (patch) | |
| tree | 0eb011bc6b32a44df8c343ffedbc15e2ddd046e9 /synapse/rest/base.py | |
| parent | schema version is now 10 (diff) | |
| parent | Update README.rst (diff) | |
| download | synapse-b56730bb6e549e6b22c95858cae50e091de96844.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/rest/base.py')
| -rw-r--r-- | synapse/rest/base.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/base.py b/synapse/rest/base.py index 79fc4dfb84..06eda2587c 100644 --- a/synapse/rest/base.py +++ b/synapse/rest/base.py @@ -63,12 +63,10 @@ class RestServlet(object): self.hs = hs self.handlers = hs.get_handlers() - self.event_factory = hs.get_event_factory() + self.builder_factory = hs.get_event_builder_factory() self.auth = hs.get_auth() self.txns = HttpTransactionStore() - self.validator = hs.get_event_validator() - def register(self, http_server): """ Register this servlet with the given HTTP server. """ if hasattr(self, "PATTERN"): |