diff options
| author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2020-06-16 13:51:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 08:51:47 -0400 |
| commit | a3f11567d930b7da0db068c3b313f6f4abbf12a1 (patch) | |
| tree | ee9f7b2e8a8e088b4f745f07d79867ad2b163211 /synapse/replication | |
| parent | Convert the device message and pagination handlers to async/await. (#7678) (diff) | |
| download | synapse-a3f11567d930b7da0db068c3b313f6f4abbf12a1.tar.xz | |
Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'synapse/replication')
| -rw-r--r-- | synapse/replication/http/_base.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py index 793cef6c26..9caf1e80c1 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py @@ -16,12 +16,10 @@ import abc import logging import re +import urllib from inspect import signature from typing import Dict, List, Tuple -from six import raise_from -from six.moves import urllib - from twisted.internet import defer from synapse.api.errors import ( @@ -220,7 +218,7 @@ class ReplicationEndpoint(object): # importantly, not stack traces everywhere) raise e.to_synapse_error() except RequestSendFailed as e: - raise_from(SynapseError(502, "Failed to talk to master"), e) + raise SynapseError(502, "Failed to talk to master") from e return result |