diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
| commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
| tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/appservice/api.py | |
| parent | Add an isort configuration (#3463) (diff) | |
| parent | changelog (diff) | |
| download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz | |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/appservice/api.py')
| -rw-r--r-- | synapse/appservice/api.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py index 47251fb6ad..6980e5890e 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py @@ -12,19 +12,19 @@ # 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 logging +import urllib + +from prometheus_client import Counter + from twisted.internet import defer from synapse.api.constants import ThirdPartyEntityKind from synapse.api.errors import CodeMessageException -from synapse.http.client import SimpleHttpClient from synapse.events.utils import serialize_event -from synapse.util.caches.response_cache import ResponseCache +from synapse.http.client import SimpleHttpClient from synapse.types import ThirdPartyInstanceID - -import logging -import urllib - -from prometheus_client import Counter +from synapse.util.caches.response_cache import ResponseCache logger = logging.getLogger(__name__) |