Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 13:56:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into uhoreg/e2e_cross-signing_merged

Browse source
This commit is contained in:
Hubert Chathi 2019-10-18 11:39:40 +01:00
commit cfc28325a6
346 changed files with 9527 additions and 5043 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/api/errors.py
View file

@ -17,6 +17,7 @@
"""Contains exceptions and error codes."""
import logging
from typing import Dict
from six import iteritems
from six.moves import http_client
@ -112,7 +113,7 @@ class ProxiedRequestError(SynapseError):
def __init__(self, code, msg, errcode=Codes.UNKNOWN, additional_fields=None):
super(ProxiedRequestError, self).__init__(code, msg, errcode)
if additional_fields is None:
self._additional_fields = {}
self._additional_fields = {} # type: Dict
else:
self._additional_fields = dict(additional_fields)