diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-12-30 18:40:19 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-12-30 18:40:19 +0000 |
| commit | 65abc90fb6f10a91d72bc4518a8d155251d23a6f (patch) | |
| tree | f0e0bf17869b405b1b3cc4b04a3897a0796f995f | |
| parent | federation_client: clean up imports (diff) | |
| download | synapse-65abc90fb6f10a91d72bc4518a8d155251d23a6f.tar.xz | |
federation_server: clean up imports
| -rw-r--r-- | synapse/federation/federation_server.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index a2327f24b6..5fdfbbeee5 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -12,25 +12,22 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from twisted.internet import defer +import logging -from .federation_base import FederationBase -from .units import Transaction, Edu +import simplejson as json +from twisted.internet import defer +from synapse.api.errors import AuthError, FederationError, SynapseError +from synapse.crypto.event_signing import compute_event_signature +from synapse.events import FrozenEvent +from synapse.federation.federation_base import FederationBase +from synapse.federation.units import Edu, Transaction +import synapse.metrics +from synapse.types import get_domain_from_id from synapse.util import async +from synapse.util.caches.response_cache import ResponseCache from synapse.util.logcontext import make_deferred_yieldable, preserve_fn from synapse.util.logutils import log_function -from synapse.util.caches.response_cache import ResponseCache -from synapse.events import FrozenEvent -from synapse.types import get_domain_from_id -import synapse.metrics - -from synapse.api.errors import AuthError, FederationError, SynapseError - -from synapse.crypto.event_signing import compute_event_signature - -import simplejson as json -import logging # when processing incoming transactions, we try to handle multiple rooms in # parallel, up to this limit. |