diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
| commit | 0484d7f6e98507d7c2138aa7959e722912bb4769 (patch) | |
| tree | c567e8ea0586fa33a6ff2499855ee9b1a89a4ca4 /synapse/server.py | |
| parent | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-0484d7f6e98507d7c2138aa7959e722912bb4769.tar.xz | |
Merge branch 'develop' into client_v2_filter
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() |