From ec10e585ee90e99dc197cf6ffbdf62fb3f6ec7b9 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Dec 2018 00:05:33 +0000 Subject: [PATCH 1/3] add isort to CI --- setup.cfg | 13 ++++++++++++- tox.ini | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index ea8762f0..077231ec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,4 +14,15 @@ addopts = test/ universal = 1 [metadata] -license_file = LICENSE \ No newline at end of file +license_file = LICENSE + +[isort] +line_length = 89 +not_skip = __init__.py +sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER +default_section=THIRDPARTY +known_first_party = matrix_client +known_tests=tests +multi_line_output=3 +include_trailing_comma=true +combine_as_imports=true \ No newline at end of file diff --git a/tox.ini b/tox.ini index bde77162..39ba73e4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,py35,py36,packaging,pep8,docs +envlist = py27,py34,py35,py36,packaging,pep8,docs,check_isort [testenv] passenv = TRAVIS TRAVIS_* @@ -33,6 +33,11 @@ deps = .[doc] changedir = docs commands = sphinx-build -W source build/html +[testenv:check_isort] +skip_install = True +deps = isort +commands = /bin/sh -c "isort -c -sp setup.cfg -rc matrix_client samples test" + [travis] python = 2.7: py27 From eb611e01a0c0630e2f27504504b9ae4d60d96c71 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Dec 2018 00:15:15 +0000 Subject: [PATCH 2/3] isort --- matrix_client/api.py | 12 +++++++----- matrix_client/client.py | 14 ++++++++------ matrix_client/room.py | 2 +- samples/ChangeDisplayName.py | 6 +++--- samples/GetUserProfile.py | 5 +++-- samples/SetRoomProfile.py | 6 +++--- samples/SimpleChatClient.py | 7 ++++--- samples/UserPassOrTokenClient.py | 6 ++++-- test/api_test.py | 13 ++++++++----- test/client_test.py | 10 +++++++--- test/crypto/olm_device_test.py | 11 +++++++---- 11 files changed, 55 insertions(+), 37 deletions(-) diff --git a/matrix_client/api.py b/matrix_client/api.py index aae52f99..9c1904d2 100644 --- a/matrix_client/api.py +++ b/matrix_client/api.py @@ -16,12 +16,14 @@ import json import warnings -from requests import Session, RequestException -from time import time, sleep -from .__init__ import __version__ -from .errors import MatrixError, MatrixRequestError, MatrixHttpLibError -from urllib3.util import parse_url +from time import sleep, time + +from requests import RequestException, Session from urllib3.exceptions import LocationParseError +from urllib3.util import parse_url + +from .__init__ import __version__ +from .errors import MatrixError, MatrixHttpLibError, MatrixRequestError try: from urllib import quote diff --git a/matrix_client/client.py b/matrix_client/client.py index 703b825c..54eb1c10 100644 --- a/matrix_client/client.py +++ b/matrix_client/client.py @@ -12,21 +12,23 @@ # 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 sys +from threading import Thread +from time import sleep +from uuid import uuid4 +from warnings import warn + from .api import MatrixHttpApi from .errors import MatrixRequestError, MatrixUnexpectedResponse from .room import Room from .user import User + try: from .crypto.olm_device import OlmDevice ENCRYPTION_SUPPORT = True except ImportError: ENCRYPTION_SUPPORT = False -from threading import Thread -from time import sleep -from uuid import uuid4 -from warnings import warn -import logging -import sys logger = logging.getLogger(__name__) diff --git a/matrix_client/room.py b/matrix_client/room.py index 488f335b..1bc89b9d 100644 --- a/matrix_client/room.py +++ b/matrix_client/room.py @@ -17,8 +17,8 @@ from uuid import uuid4 from .checks import check_room_id -from .user import User from .errors import MatrixRequestError +from .user import User class Room(object): diff --git a/samples/ChangeDisplayName.py b/samples/ChangeDisplayName.py index b2a1d029..369b4948 100644 --- a/samples/ChangeDisplayName.py +++ b/samples/ChangeDisplayName.py @@ -9,12 +9,12 @@ # 11 - Serverside Error import sys -import samples_common -from matrix_client.client import MatrixClient -from matrix_client.api import MatrixRequestError +import samples_common from requests.exceptions import MissingSchema +from matrix_client.api import MatrixRequestError +from matrix_client.client import MatrixClient host, username, password = samples_common.get_user_details(sys.argv) diff --git a/samples/GetUserProfile.py b/samples/GetUserProfile.py index 3c2689c0..e5723005 100755 --- a/samples/GetUserProfile.py +++ b/samples/GetUserProfile.py @@ -9,11 +9,12 @@ import sys + import samples_common # Common bits used between samples +from requests.exceptions import MissingSchema -from matrix_client.client import MatrixClient from matrix_client.api import MatrixRequestError -from requests.exceptions import MissingSchema +from matrix_client.client import MatrixClient host, username, password = samples_common.get_user_details(sys.argv) diff --git a/samples/SetRoomProfile.py b/samples/SetRoomProfile.py index 408380e9..290d9fae 100644 --- a/samples/SetRoomProfile.py +++ b/samples/SetRoomProfile.py @@ -9,12 +9,12 @@ # 11 - Serverside Error import sys -import samples_common -from matrix_client.client import MatrixClient -from matrix_client.api import MatrixRequestError +import samples_common from requests.exceptions import MissingSchema +from matrix_client.api import MatrixRequestError +from matrix_client.client import MatrixClient host, username, password = samples_common.get_user_details(sys.argv) diff --git a/samples/SimpleChatClient.py b/samples/SimpleChatClient.py index b742e96f..7092e9b3 100755 --- a/samples/SimpleChatClient.py +++ b/samples/SimpleChatClient.py @@ -11,13 +11,14 @@ # 11 - Wrong room format. # 12 - Couldn't find room. +import logging import sys + import samples_common # Common bits used between samples -import logging +from requests.exceptions import MissingSchema -from matrix_client.client import MatrixClient from matrix_client.api import MatrixRequestError -from requests.exceptions import MissingSchema +from matrix_client.client import MatrixClient # Called when a message is recieved. diff --git a/samples/UserPassOrTokenClient.py b/samples/UserPassOrTokenClient.py index 2c80c425..d9b85d50 100644 --- a/samples/UserPassOrTokenClient.py +++ b/samples/UserPassOrTokenClient.py @@ -16,9 +16,11 @@ """ import argparse -from matrix_client.client import MatrixClient + +from requests.exceptions import InvalidSchema, MissingSchema + from matrix_client.api import MatrixRequestError -from requests.exceptions import MissingSchema, InvalidSchema +from matrix_client.client import MatrixClient def example(host, user, password, token): diff --git a/test/api_test.py b/test/api_test.py index 90175918..a0199fbf 100644 --- a/test/api_test.py +++ b/test/api_test.py @@ -1,11 +1,14 @@ -import responses -import pytest import json from copy import deepcopy -from matrix_client import client, api -from matrix_client.errors import MatrixRequestError, MatrixError, MatrixHttpLibError -from matrix_client import __version__ as lib_version + +import pytest +import responses + +from matrix_client import __version__ as lib_version, api, client +from matrix_client.errors import MatrixError, MatrixHttpLibError, MatrixRequestError + from . import response_examples + MATRIX_V2_API_PATH = "/_matrix/client/r0" diff --git a/test/client_test.py b/test/client_test.py index c5884924..0fa59992 100644 --- a/test/client_test.py +++ b/test/client_test.py @@ -1,10 +1,14 @@ -import pytest -import responses import json from copy import deepcopy -from matrix_client.client import MatrixClient, Room, User, CACHE + +import pytest +import responses + from matrix_client.api import MATRIX_V2_API_PATH +from matrix_client.client import CACHE, MatrixClient, Room, User + from . import response_examples + try: from urllib import quote except ImportError: diff --git a/test/crypto/olm_device_test.py b/test/crypto/olm_device_test.py index 84f56df6..5d6dfc54 100644 --- a/test/crypto/olm_device_test.py +++ b/test/crypto/olm_device_test.py @@ -1,15 +1,18 @@ -import pytest -pytest.importorskip("olm") # noqa - import json from copy import deepcopy +from test.response_examples import example_key_upload_response +import pytest import responses from matrix_client.api import MATRIX_V2_API_PATH from matrix_client.client import MatrixClient from matrix_client.crypto.olm_device import OlmDevice -from test.response_examples import example_key_upload_response + +pytest.importorskip("olm") # noqa + + + HOSTNAME = 'http://example.com' From 0d3a4d96c278c5b4fd7e6ddb0bd598bdc8998af8 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Dec 2018 00:24:34 +0000 Subject: [PATCH 3/3] remove white space --- test/crypto/olm_device_test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/crypto/olm_device_test.py b/test/crypto/olm_device_test.py index 5d6dfc54..f81a2c38 100644 --- a/test/crypto/olm_device_test.py +++ b/test/crypto/olm_device_test.py @@ -11,9 +11,6 @@ pytest.importorskip("olm") # noqa - - - HOSTNAME = 'http://example.com'