diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-26 16:23:48 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-26 16:23:48 +0000 |
| commit | 9b6aaf2074c6a47f673f91926a0ba9faf219e8ce (patch) | |
| tree | 15e3c49e081f0182a4ef278afdd6d34695db5cc5 /synapse/server.py | |
| parent | Create (empty) v2_alpha REST tests directory (diff) | |
| parent | Remove unused import from server.py (diff) | |
| download | synapse-9b6aaf2074c6a47f673f91926a0ba9faf219e8ce.tar.xz | |
Merge pull request #34 from matrix-org/remove_serialize_event_from_hs
Don't pass the HS to serialize_event just so that it can get the current time.
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/server.py b/synapse/server.py index 92ed2c5e32..f09d5d581e 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -20,7 +20,6 @@ # Imports required for the default HomeServer() implementation from synapse.federation import initialize_http_replication -from synapse.events.utils import serialize_event from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers @@ -124,9 +123,6 @@ class BaseHomeServer(object): setattr(BaseHomeServer, "get_%s" % (depname), _get) - def serialize_event(self, e, as_client_event=True): - return serialize_event(self, e, as_client_event) - def get_ip_from_request(self, request): # May be an X-Forwarding-For header depending on config ip_addr = request.getClientIP() |