fix imports

Author: dklimpel

synapse/http/federation/matrix_federation_agent.py

@@ -39,11 +39,7 @@
 from synapse.http.connectproxyclient import HTTPConnectProxyEndpoint
 from synapse.http.federation.srv_resolver import Server, SrvResolver
 from synapse.http.federation.well_known_resolver import WellKnownResolver
-from synapse.http.proxyagent import (
-    ProxyAgent,
-    ProxyCredentials,
-    parse_username_password,
-)
+from synapse.http.proxyagent import ProxyAgent, parse_username_password
 from synapse.logging.context import make_deferred_yieldable, run_in_background
 from synapse.types import ISynapseReactor
 from synapse.util import Clock

tests/http/federation/test_matrix_federation_agent.py

@@ -15,10 +15,9 @@
 import logging
 import os
 from typing import Iterable, Optional
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import treq
-from mock import Mock
 from netaddr import IPSet
 from service_identity import VerificationError
 from zope.interface import implementer