diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-23 10:37:38 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-23 10:37:38 +0000 |
commit | 7256def8e43bf5ab982cb7e785fb1334a1ef4ab8 (patch) | |
tree | 44c5eb1754851f7467bb1ec4a0ee7dee7524af17 /synapse/server.py | |
parent | Merge pull request #30 from matrix-org/client_api_restructure (diff) | |
download | synapse-7256def8e43bf5ab982cb7e785fb1334a1ef4ab8.tar.xz |
Merge rest servlets into the client json resource object
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/synapse/server.py b/synapse/server.py index e9add8e2b4..476d809374 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -24,7 +24,6 @@ from synapse.events.utils import serialize_event from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers -from synapse.rest.client.v1 import RestServletFactory from synapse.state import StateHandler from synapse.storage import DataStore from synapse.types import UserID, RoomAlias, RoomID, EventID @@ -203,9 +202,6 @@ class HomeServer(BaseHomeServer): def build_auth(self): return Auth(self) - def build_rest_servlet_factory(self): - return RestServletFactory(self) - def build_state_handler(self): return StateHandler(self) @@ -229,9 +225,3 @@ class HomeServer(BaseHomeServer): clock=self.get_clock(), hostname=self.hostname, ) - - def register_servlets(self): - """ Register all servlets associated with this HomeServer. - """ - # Simply building the ServletFactory is sufficient to have it register - self.get_rest_servlet_factory() |