From 531d686d8f10ea5073713b643f1274ef7cf7107c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 19 Jun 2019 12:07:56 +0200 Subject: [PATCH] pantalaimon: Run isort. --- pantalaimon/daemon.py | 7 +++---- tests/conftest.py | 12 ++++++------ tests/proxy_test.py | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pantalaimon/daemon.py b/pantalaimon/daemon.py index 982d806..e9655c2 100755 --- a/pantalaimon/daemon.py +++ b/pantalaimon/daemon.py @@ -28,9 +28,9 @@ from multidict import CIMultiDict from nio import (Api, EncryptionError, LoginResponse, OlmTrustError, SendRetryError) -from pantalaimon.client import (InvalidLimit, InvalidOrderByError, PanClient, - UnknownRoomError, SEARCH_TERMS_SCHEMA, - validate_json) +from pantalaimon.client import (SEARCH_TERMS_SCHEMA, InvalidLimit, + InvalidOrderByError, PanClient, + UnknownRoomError, validate_json) from pantalaimon.index import InvalidQueryError from pantalaimon.log import logger from pantalaimon.store import ClientInfo, PanStore @@ -49,7 +49,6 @@ from pantalaimon.thread_messages import (AcceptSasMessage, CancelSasMessage, UpdateDevicesMessage, UpdateUsersMessage) - CORS_HEADERS = { "Access-Control-Allow-Headers": ( "Origin, X-Requested-With, Content-Type, Accept, Authorization" diff --git a/tests/conftest.py b/tests/conftest.py index 43bb84f..c7ac827 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,22 +1,22 @@ import asyncio import shutil import tempfile -import janus from random import choices -from urllib.parse import urlparse from string import ascii_letters, ascii_uppercase, digits +from urllib.parse import urlparse + +import janus +import pytest from aiohttp import web from aioresponses import aioresponses - -import pytest from faker import Faker from faker.providers import BaseProvider from nio.crypto import OlmAccount from nio.store import SqliteStore -from pantalaimon.store import ClientInfo, PanStore -from pantalaimon.daemon import ProxyDaemon from pantalaimon.config import ServerConfig +from pantalaimon.daemon import ProxyDaemon +from pantalaimon.store import ClientInfo, PanStore faker = Faker() diff --git a/tests/proxy_test.py b/tests/proxy_test.py index 2b1f334..14d58aa 100644 --- a/tests/proxy_test.py +++ b/tests/proxy_test.py @@ -1,6 +1,6 @@ import asyncio -import re import json +import re from aiohttp import web