summary refs log tree commit diff
path: root/synapse/federation/federation_base.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-16 11:20:17 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-16 11:20:17 +0100
commitf1f70bf4b5172beb1eae671ad4016e342a6cdc92 (patch)
tree7c6cfa9161a534505eb4e33588a1300647100ebd /synapse/federation/federation_base.py
parentAdd worker config module (diff)
parentMerge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff)
downloadsynapse-f1f70bf4b5172beb1eae671ad4016e342a6cdc92.tar.xz
Merge remote-tracking branch 'origin/develop' into markjh/worker_config
Diffstat (limited to 'synapse/federation/federation_base.py')
-rw-r--r--synapse/federation/federation_base.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
index a0b7cb7963..da2f5e8cfd 100644
--- a/synapse/federation/federation_base.py
+++ b/synapse/federation/federation_base.py
@@ -31,6 +31,9 @@ logger = logging.getLogger(__name__)
 
 
 class FederationBase(object):
+    def __init__(self, hs):
+        pass
+
     @defer.inlineCallbacks
     def _check_sigs_and_hash_and_fetch(self, origin, pdus, outlier=False,
                                        include_none=False):