Merge pull request #466 from mattbennett/import-lint

Import lint

.isort.cfg

@@ -0,0 +1,10 @@
+[settings]
+line_length=79
+skip=nameko/cli/run.py
+known_third_party=six
+known_first_party=nameko
+indent='    '
+multi_line_output=5
+forced_separate=test
+default_section=THIRDPARTY
+lines_after_imports=2

Makefile

@@ -1,6 +1,11 @@
 .PHONY: test docs
 
 ENABLE_BRANCH_COVERAGE ?= 0
+AUTO_FIX_IMPORTS ?= 0
+
+ifneq ($(AUTO_FIX_IMPORTS), 1)
+  autofix = --check-only
+endif
 
 test: flake8 pylint test_lib test_examples
 
@@ -10,6 +15,9 @@ flake8:
 pylint:
 	pylint --rcfile=pylintrc nameko -E
 
+imports:
+	isort -rc $(autofix) nameko test
+
 test_lib:
 	BRANCH=$(ENABLE_BRANCH_COVERAGE) py.test test --strict --timeout 30 --cov --cov-config=$(CURDIR)/.coveragerc
 

nameko/amqp/publish.py

@@ -1,12 +1,13 @@
-from contextlib import contextmanager
 import warnings
+from contextlib import contextmanager
 
 from kombu import Connection
 from kombu.pools import connections, producers
 from six.moves import queue as Queue
 
 from nameko.constants import DEFAULT_RETRY_POLICY
 
+
 # delivery_mode
 NON_PERSISENT = 1
 PERSISTENT = 2

nameko/amqp/utils.py

@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 
 import amqp
+import six
 from amqp.exceptions import NotAllowed
-
 from kombu import Connection
 from kombu.transport.pyamqp import Transport
-import six
 
 
 BAD_CREDENTIALS = (

nameko/cli/main.py

@@ -3,11 +3,14 @@
 import argparse
 import os
 import re
+
 import yaml
 
 from nameko.exceptions import CommandError, ConfigurationError
+
 from . import commands
 
+
 ENV_VAR_MATCHER = re.compile(
     r"""
         \$\{       # match characters `${` literally

nameko/cli/run.py

@@ -15,6 +15,7 @@
 import six
 import yaml
 from eventlet import backdoor
+
 from nameko.constants import AMQP_URI_CONFIG_KEY
 from nameko.exceptions import CommandError
 from nameko.extensions import ENTRYPOINT_EXTENSIONS_ATTR

nameko/cli/shell.py

@@ -1,12 +1,13 @@
 import code
 import os
 import sys
-import yaml
 from types import ModuleType
 
+import yaml
+
 from nameko.constants import AMQP_URI_CONFIG_KEY
-from nameko.standalone.rpc import ClusterRpcProxy
 from nameko.standalone.events import event_dispatcher
+from nameko.standalone.rpc import ClusterRpcProxy
 
 from .commands import Shell
 

nameko/containers.py

@@ -11,16 +11,20 @@
 from eventlet.event import Event
 from eventlet.greenpool import GreenPool
 from greenlet import GreenletExit  # pylint: disable=E0611
+
 from nameko.constants import (
     CALL_ID_STACK_CONTEXT_KEY, DEFAULT_MAX_WORKERS,
     DEFAULT_PARENT_CALLS_TRACKED, DEFAULT_SERIALIZER, MAX_WORKERS_CONFIG_KEY,
-    PARENT_CALLS_CONFIG_KEY, SERIALIZER_CONFIG_KEY)
+    PARENT_CALLS_CONFIG_KEY, SERIALIZER_CONFIG_KEY
+)
 from nameko.exceptions import ConfigurationError, ContainerBeingKilled
 from nameko.extensions import (
-    ENTRYPOINT_EXTENSIONS_ATTR, is_dependency, iter_extensions)
+    ENTRYPOINT_EXTENSIONS_ATTR, is_dependency, iter_extensions
+)
 from nameko.log_helpers import make_timing_logger
 from nameko.utils import SpawningSet, import_from_path
 
+
 _log = getLogger(__name__)
 _log_time = make_timing_logger(_log)
 

nameko/contextdata.py

@@ -1,6 +1,6 @@
 from nameko.constants import (
-    LANGUAGE_CONTEXT_KEY, USER_ID_CONTEXT_KEY, USER_AGENT_CONTEXT_KEY,
-    AUTH_TOKEN_CONTEXT_KEY,
+    AUTH_TOKEN_CONTEXT_KEY, LANGUAGE_CONTEXT_KEY, USER_AGENT_CONTEXT_KEY,
+    USER_ID_CONTEXT_KEY
 )
 from nameko.extensions import DependencyProvider
 

nameko/events.py

@@ -34,9 +34,11 @@ def bar(event_data):
 from logging import getLogger
 
 from kombu import Queue
+
 from nameko.messaging import Consumer, Publisher
 from nameko.standalone.events import get_event_exchange
 
+
 SERVICE_POOL = "service_pool"
 SINGLETON = "singleton"
 BROADCAST = "broadcast"

nameko/extensions.py

@@ -1,15 +1,16 @@
 from __future__ import absolute_import
 
-from functools import partial
 import inspect
-from logging import getLogger
 import types
 import weakref
+from functools import partial
+from logging import getLogger
 
 from eventlet.event import Event
 
 from nameko.exceptions import IncorrectSignature
 
+
 _log = getLogger(__name__)
 
 

nameko/log_helpers.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from contextlib import contextmanager
 import logging
 import time
+from contextlib import contextmanager
 
 
 def make_timing_logger(logger, precision=3, level=logging.DEBUG):

nameko/messaging.py

@@ -3,13 +3,13 @@
 '''
 from __future__ import absolute_import
 
+import warnings
 from functools import partial
 from logging import getLogger
-import warnings
 
 import six
-from eventlet.event import Event
 from amqp.exceptions import RecoverableConnectionError
+from eventlet.event import Event
 from kombu import Connection
 from kombu.common import maybe_declare
 from kombu.mixins import ConsumerMixin
@@ -18,13 +18,16 @@
 from nameko.amqp.publish import get_connection
 from nameko.amqp.utils import verify_amqp_uri
 from nameko.constants import (
-    AMQP_URI_CONFIG_KEY, DEFAULT_HEARTBEAT,
-    DEFAULT_SERIALIZER, HEARTBEAT_CONFIG_KEY, SERIALIZER_CONFIG_KEY)
+    AMQP_URI_CONFIG_KEY, DEFAULT_HEARTBEAT, DEFAULT_SERIALIZER,
+    HEARTBEAT_CONFIG_KEY, SERIALIZER_CONFIG_KEY
+)
 from nameko.exceptions import ContainerBeingKilled
 from nameko.extensions import (
-    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension)
+    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension
+)
 from nameko.utils.retry import retry
 
+
 _log = getLogger(__name__)
 
 # delivery_mode

nameko/rpc.py

@@ -13,14 +13,18 @@
 from nameko.amqp.publish import Publisher, UndeliverableMessage
 from nameko.constants import (
     AMQP_URI_CONFIG_KEY, DEFAULT_SERIALIZER, RPC_EXCHANGE_CONFIG_KEY,
-    SERIALIZER_CONFIG_KEY)
+    SERIALIZER_CONFIG_KEY
+)
 from nameko.exceptions import (
     ContainerBeingKilled, MalformedRequest, MethodNotFound, RpcConnectionError,
-    UnknownService, UnserializableValueError, deserialize, serialize)
+    UnknownService, UnserializableValueError, deserialize, serialize
+)
 from nameko.extensions import (
-    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension)
+    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension
+)
 from nameko.messaging import HeaderDecoder, HeaderEncoder, QueueConsumer
 
+
 _log = getLogger(__name__)
 
 

nameko/runners.py

@@ -6,6 +6,7 @@
 from nameko.containers import get_container_cls, get_service_name
 from nameko.utils import SpawningProxy
 
+
 _log = getLogger(__name__)
 
 

nameko/standalone/rpc.py

@@ -10,12 +10,14 @@
 
 from nameko.amqp import verify_amqp_uri
 from nameko.constants import (
-    AMQP_URI_CONFIG_KEY, DEFAULT_SERIALIZER, SERIALIZER_CONFIG_KEY)
+    AMQP_URI_CONFIG_KEY, DEFAULT_SERIALIZER, SERIALIZER_CONFIG_KEY
+)
 from nameko.containers import WorkerContext
 from nameko.exceptions import RpcConnectionError, RpcTimeout
 from nameko.extensions import Entrypoint
 from nameko.rpc import ReplyListener, ServiceProxy
 
+
 _logger = logging.getLogger(__name__)
 
 

nameko/testing/rabbit.py

@@ -1,8 +1,9 @@
 import json
 
-from requests import HTTPError, Session, ConnectionError
-from six.moves.urllib.parse import quote  # pylint: disable=E0401
 import six
+from requests import ConnectionError, HTTPError, Session
+from six.moves.urllib.parse import quote  # pylint: disable=E0401
+
 
 __all__ = ['Client', 'HTTPError']
 

nameko/testing/websocket.py

@@ -1,8 +1,7 @@
 from __future__ import absolute_import
 
-import uuid
 import json
-
+import uuid
 from collections import defaultdict
 
 from eventlet.event import Event

nameko/timer.py

@@ -8,6 +8,7 @@
 
 from nameko.extensions import Entrypoint
 
+
 _log = getLogger(__name__)
 
 

nameko/web/handlers.py

@@ -1,12 +1,12 @@
-from logging import getLogger
 from functools import partial
+from logging import getLogger
 
-from eventlet.event import Event
 import six
-from werkzeug.wrappers import Response
+from eventlet.event import Event
 from werkzeug.routing import Rule
+from werkzeug.wrappers import Response
 
-from nameko.exceptions import serialize, BadRequest
+from nameko.exceptions import BadRequest, serialize
 from nameko.extensions import Entrypoint
 from nameko.web.server import WebServer
 

nameko/web/server.py

@@ -2,12 +2,12 @@
 import socket
 from collections import namedtuple
 from functools import partial
+from logging import getLogger
 
 import eventlet
 from eventlet import wsgi
 from eventlet.support import get_errno
 from eventlet.wsgi import BROKEN_SOCK, BaseHTTPServer, HttpProtocol
-from logging import getLogger
 from werkzeug.exceptions import HTTPException
 from werkzeug.routing import Map
 from werkzeug.wrappers import Request
@@ -16,6 +16,7 @@
 from nameko.exceptions import ConfigurationError
 from nameko.extensions import ProviderCollector, SharedExtension
 
+
 BindAddress = namedtuple("BindAddress", ['address', 'port'])
 
 

nameko/web/websocket.py

@@ -4,15 +4,19 @@
 from functools import partial
 from logging import getLogger
 
+import six
 from eventlet.event import Event
 from eventlet.websocket import WebSocketWSGI
+from werkzeug.routing import Rule
+
 from nameko.exceptions import (
-    ConnectionNotFound, MalformedRequest, MethodNotFound, serialize)
+    ConnectionNotFound, MalformedRequest, MethodNotFound, serialize
+)
 from nameko.extensions import (
-    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension)
+    DependencyProvider, Entrypoint, ProviderCollector, SharedExtension
+)
 from nameko.web.server import WebServer
-import six
-from werkzeug.routing import Rule
+
 
 _log = getLogger(__name__)
 

setup.py

@@ -35,6 +35,7 @@
         'dev': [
             "coverage==4.4.1",
             "flake8==3.3.0",
+            "isort==4.2.15",
             "mccabe==0.6.1",
             "pycodestyle==2.3.1",
             "pyflakes==1.5.0",

test/amqp/test_publish.py

@@ -4,7 +4,8 @@
 
 import pytest
 from amqp.exceptions import (
-    NotFound, PreconditionFailed, RecoverableConnectionError)
+    NotFound, PreconditionFailed, RecoverableConnectionError
+)
 from kombu import Connection
 from kombu.common import maybe_declare
 from kombu.compression import get_encoder
@@ -14,7 +15,8 @@
 from six.moves import queue
 
 from nameko.amqp.publish import (
-    Publisher, UndeliverableMessage, get_connection, get_producer)
+    Publisher, UndeliverableMessage, get_connection, get_producer
+)
 
 
 def test_get_connection(rabbit_config):

test/cli/test_backdoor.py

@@ -1,6 +1,6 @@
 import eventlet
-from mock import patch, DEFAULT
 import pytest
+from mock import DEFAULT, patch
 
 from nameko.cli.commands import Backdoor
 from nameko.cli.main import setup_parser

test/cli/test_main.py

@@ -1,9 +1,9 @@
+import os
 import sys
 
-from mock import patch
-import os
 import pytest
 import yaml
+from mock import patch
 
 from nameko.cli.main import main, setup_parser, setup_yaml_parser
 from nameko.exceptions import CommandError, ConfigurationError