summary refs log tree commit diff
path: root/synapse/http/endpoint.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-09 10:24:43 +0100
committerGitHub <noreply@github.com>2018-07-09 10:24:43 +0100
commit395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch)
tree1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/http/endpoint.py
parentAdd an isort configuration (#3463) (diff)
parentchangelog (diff)
downloadsynapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to '')
-rw-r--r--synapse/http/endpoint.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py

index 1b1123b292..d65daa72bb 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py
@@ -12,20 +12,18 @@ # 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. +import collections +import logging +import random import re +import time -from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS from twisted.internet import defer +from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS from twisted.internet.error import ConnectError from twisted.names import client, dns from twisted.names.error import DNSNameError, DomainError -import collections -import logging -import random -import time - - logger = logging.getLogger(__name__)