Fix isort config and imports

examples/callback.py

@@ -1,6 +1,7 @@
+import ssl
+
 import logbook
 import logbook.more
-import ssl
 from aiohttp import web
 
 from threema.gateway import (

setup.cfg

@@ -9,11 +9,8 @@ line_length = 90
 multi_line_output = 3
 force_grid_wrap = true
 balanced_wrapping = true
-order_by_type = true
 atomic = true
 include_trailing_comma = true
-known_standard_library = asyncio,typing
-known_first_party = threema
 
 [tool:pytest]
 asyncio_mode=strict

setup.py

@@ -1,6 +1,7 @@
 import ast
 import os
 import sys
+
 from setuptools import (
     find_packages,
     setup,

tests/conftest.py

@@ -1,22 +1,22 @@
 import asyncio
 import asyncio.subprocess
-
-import aiohttp
 import binascii
 import collections
 import copy
 import hashlib
 import hmac
 import os
-import pytest
 import socket
 import ssl
 import subprocess
 import sys
 import time
-from aiohttp import web
 from contextlib import closing
 
+import aiohttp
+import pytest
+from aiohttp import web
+
 import threema.gateway
 from threema.gateway import e2e
 from threema.gateway.key import Key

tests/test_cli.py

@@ -1,6 +1,7 @@
-import pytest
 import subprocess
 
+import pytest
+
 from threema.gateway import ReceptionCapability
 from threema.gateway import __version__ as _version
 from threema.gateway import feature_level

threema/gateway/_gateway.py

@@ -1,5 +1,6 @@
-import aiohttp
 import enum
+
+import aiohttp
 import libnacl.encode
 import libnacl.public
 

threema/gateway/bin/gateway_client.py

@@ -2,11 +2,12 @@
 The command line interface for the Threema gateway service.
 """
 import binascii
+import os
+import re
+
 import click
 import logbook
 import logbook.more
-import os
-import re
 
 from threema.gateway import Connection
 from threema.gateway import __version__ as _version

threema/gateway/e2e.py

@@ -1,8 +1,6 @@
 """
 Provides classes and functions for the end-to-end encryption mode.
 """
-from typing import Tuple
-
 import abc
 import binascii
 import collections
@@ -12,13 +10,15 @@
 import hashlib
 import hmac
 import json
+import mimetypes
+import os
+import struct
+from typing import Tuple
+
 import libnacl
 import libnacl.encode
 import libnacl.public
 import libnacl.secret
-import mimetypes
-import os
-import struct
 from aiohttp import web
 
 from . import ReceptionCapability

threema/gateway/key.py

@@ -4,6 +4,7 @@
 import enum
 import hashlib
 import hmac
+
 import libnacl.encode
 import libnacl.public
 import libnacl.secret

threema/gateway/util.py

@@ -2,18 +2,18 @@
 Utility functions.
 """
 import asyncio
-from typing import Set  # noqa
-
 import collections
 import functools
 import inspect
 import io
+import logging
+import os
+from typing import Set  # noqa
+
 import libnacl
 import logbook
 import logbook.compat
 import logbook.more
-import logging
-import os
 import wrapt
 
 from .key import Key