summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 16:32:40 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 16:32:40 +0000
commit3186c5bdbc49cf7cbca3ae0b45bc8657b069a9a8 (patch)
treedd7ba7aeb2be210a86668a7dc675627b17ec721e /synapse/server.py
parentAdd handler for /sync API (diff)
parentMerge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff)
downloadsynapse-3186c5bdbc49cf7cbca3ae0b45bc8657b069a9a8.tar.xz
Merge branch 'develop' into client_v2_sync
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py4
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()