summary refs log tree commit diff
path: root/synapse/federation/units.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:41:11 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:41:11 +0100
commitec50c996099af2f23964ca2fbcd0b3ae304e4852 (patch)
tree4e39fd8acb5e467c8ab256a24f5be24fe34343dd /synapse/federation/units.py
parentMerge commit '30426c706' into anoa/dinsic_release_1_21_x (diff)
parentConvert calls of async database methods to async (#8166) (diff)
downloadsynapse-ec50c996099af2f23964ca2fbcd0b3ae304e4852.tar.xz
Merge commit '9b7ac03af' into anoa/dinsic_release_1_21_x
* commit '9b7ac03af':
  Convert calls of async database methods to async (#8166)
  simple_search_list_txn should return None, not 0. (#8187)
  Fix missing _add_persisted_position (#8179)
Diffstat (limited to 'synapse/federation/units.py')
-rw-r--r--synapse/federation/units.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py

index 6b32e0dcbf..64d98fc8f6 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py
@@ -107,9 +107,7 @@ class Transaction(JsonEncodedObject): if "edus" in kwargs and not kwargs["edus"]: del kwargs["edus"] - super(Transaction, self).__init__( - transaction_id=transaction_id, pdus=pdus, **kwargs - ) + super().__init__(transaction_id=transaction_id, pdus=pdus, **kwargs) @staticmethod def create_new(pdus, **kwargs):