Introduced isort lint.isort

94 files changed, 188 insertions, 299 deletions

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 9a767c99..00000000
--- a/.coveragerc
+++ /dev/null
@@ -1,32 +0,0 @@
-[run]
-branch = 1
-cover_pylib = 0
-include=*kombu/*
-omit = kombu.tests.*
-
-[report]
-omit =
-    */python?.?/*
-    */site-packages/*
-    */pypy/*
-    *kombu/async/http/curl.py
-    *kombu/five.py
-    *kombu/transport/mongodb.py
-    *kombu/transport/filesystem.py
-    *kombu/transport/sqlalchemy/*
-    *kombu/utils.compat.py
-    *kombu/utils/eventio.py
-    *kombu/async/debug.py
-    *kombu/transport/amqplib.py
-    *kombu/transport/couchdb.py
-    *kombu/transport/beanstalk.py
-    *kombu/transport/sqlalchemy.py
-    *kombu/transport/zookeeper.py
-    *kombu/transport/zmq.py
-    *kombu/transport/django.py
-    *kombu/transport/pyro.py
-    *kombu/transport/qpid*
-exclude_lines =
-    pragma: no cover
-
-    for infinity
diff --git a/.travis.yml b/.travis.yml
index 8a08118f..fbf3c17b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,13 +22,19 @@ matrix:
       env: TOXENV=3.6
     - python: pypy
       env: TOXENV=pypy
-    - env: TOXENV=flake8
+    - python: 3.6
+      env: TOXENV=flake8
       stage: lint
     - env: TOXENV=flakeplus
       stage: lint
-    - env: TOXENV=apicheck
+    - python: 3.6
+      env: TOXENV=apicheck
       stage: lint
-    - env: TOXENV=pydocstyle
+    - python: 3.6
+      env: TOXENV=pydocstyle
+      stage: lint
+    - python: 3.6
+      env: TOXENV=isort
       stage: lint
 
 install:
diff --git a/kombu/asynchronous/aws/connection.py b/kombu/asynchronous/aws/connection.py
index df257be3..c66fd829 100644
--- a/kombu/asynchronous/aws/connection.py
+++ b/kombu/asynchronous/aws/connection.py
@@ -2,15 +2,14 @@
 """Amazon AWS Connection."""
 from __future__ import absolute_import, unicode_literals
 
+import io
+
 from vine import promise, transform
 
 from kombu.asynchronous.aws.ext import AWSRequest, get_response
-
 from kombu.asynchronous.http import Headers, Request, get_client
 from kombu.five import items, python_2_unicode_compatible
 
-import io
-
 try:  # pragma: no cover
     from email import message_from_bytes
     from email.mime.message import MIMEMessage
diff --git a/kombu/asynchronous/aws/sqs/connection.py b/kombu/asynchronous/aws/sqs/connection.py
index e51f0923..9f1b670b 100644
--- a/kombu/asynchronous/aws/sqs/connection.py
+++ b/kombu/asynchronous/aws/sqs/connection.py
@@ -10,7 +10,6 @@ from .ext import boto3
 from .message import AsyncMessage
 from .queue import AsyncQueue
 
-
 __all__ = ['AsyncSQSConnection']
 
 
diff --git a/kombu/asynchronous/debug.py b/kombu/asynchronous/debug.py
index 0e5ffbe0..d563bbdb 100644
--- a/kombu/asynchronous/debug.py
+++ b/kombu/asynchronous/debug.py
@@ -2,7 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from kombu.five import items, string_t
-from kombu.utils.eventio import READ, WRITE, ERR
+from kombu.utils.eventio import ERR, READ, WRITE
 from kombu.utils.functional import reprcall
 
 
diff --git a/kombu/asynchronous/http/base.py b/kombu/asynchronous/http/base.py
index 29bd5bdc..9ed51d86 100644
--- a/kombu/asynchronous/http/base.py
+++ b/kombu/asynchronous/http/base.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 
 import sys
 
-from vine import Thenable, promise, maybe_promise
+from vine import Thenable, maybe_promise, promise
 
 from kombu.exceptions import HttpError
 from kombu.five import items, python_2_unicode_compatible
diff --git a/kombu/asynchronous/hub.py b/kombu/asynchronous/hub.py
index d2f8b940..12b06742 100644
--- a/kombu/asynchronous/hub.py
+++ b/kombu/asynchronous/hub.py
@@ -8,12 +8,13 @@ from contextlib import contextmanager
 from time import sleep
 from types import GeneratorType as generator  # noqa
 
+from vine import Thenable, promise
+
 from kombu.five import Empty, python_2_unicode_compatible, range
 from kombu.log import get_logger
 from kombu.utils.compat import fileno
 from kombu.utils.eventio import ERR, READ, WRITE, poll
 from kombu.utils.objects import cached_property
-from vine import Thenable, promise
 
 from .timer import Timer
 
diff --git a/kombu/asynchronous/timer.py b/kombu/asynchronous/timer.py
index 6d8cbd90..14bef3ee 100644
--- a/kombu/asynchronous/timer.py
+++ b/kombu/asynchronous/timer.py
@@ -4,17 +4,16 @@ from __future__ import absolute_import, unicode_literals
 
 import heapq
 import sys
-
 from collections import namedtuple
 from datetime import datetime
 from functools import total_ordering
+from time import time as _time
 from weakref import proxy as weakrefproxy
 
 from vine.utils import wraps
 
 from kombu.five import monotonic, python_2_unicode_compatible
 from kombu.log import get_logger
-from time import time as _time
 
 try:
     from pytz import utc
diff --git a/kombu/clocks.py b/kombu/clocks.py
index cd458f62..d1e7c704 100644
--- a/kombu/clocks.py
+++ b/kombu/clocks.py
@@ -1,9 +1,9 @@
 """Logical Clocks and Synchronization."""
 from __future__ import absolute_import, unicode_literals
 
-from threading import Lock
 from itertools import islice
 from operator import itemgetter
+from threading import Lock
 
 from .five import python_2_unicode_compatible, zip
 
diff --git a/kombu/common.py b/kombu/common.py
index 47d2a59d..5cdb3fb7 100644
--- a/kombu/common.py
+++ b/kombu/common.py
@@ -4,12 +4,11 @@ from __future__ import absolute_import, unicode_literals
 import os
 import socket
 import threading
-
 from collections import deque
 from contextlib import contextmanager
 from functools import partial
 from itertools import count
-from uuid import uuid5, uuid4, uuid3, NAMESPACE_OID
+from uuid import NAMESPACE_OID, uuid3, uuid4, uuid5
 
 from amqp import RecoverableConnectionError
 
diff --git a/kombu/compression.py b/kombu/compression.py
index 9c795b4a..f27b227e 100644
--- a/kombu/compression.py
+++ b/kombu/compression.py
@@ -1,10 +1,10 @@
 """Compression utilities."""
 from __future__ import absolute_import, unicode_literals
 
-from kombu.utils.encoding import ensure_bytes
-
 import zlib
 
+from kombu.utils.encoding import ensure_bytes
+
 _aliases = {}
 _encoders = {}
 _decoders = {}
diff --git a/kombu/connection.py b/kombu/connection.py
index e3af718d..50ddf7a1 100644
--- a/kombu/connection.py
+++ b/kombu/connection.py
@@ -4,7 +4,6 @@ from __future__ import absolute_import, unicode_literals
 import os
 import socket
 import sys
-
 from collections import OrderedDict
 from contextlib import contextmanager
 from itertools import count, cycle
@@ -14,9 +13,8 @@ from operator import itemgetter
 # (Issue #112)
 from kombu import exceptions
 
-from .five import (
-    bytes_if_py2, python_2_unicode_compatible, reraise, string_t, text_t,
-)
+from .five import (bytes_if_py2, python_2_unicode_compatible, reraise,
+                   string_t, text_t)
 from .log import get_logger
 from .resource import Resource
 from .transport import get_transport_cls, supports_librabbitmq
@@ -903,6 +901,8 @@ class Connection(object):
     @property
     def is_evented(self):
         return self.transport.implements.asynchronous
+
+
 BrokerConnection = Connection  # noqa: E305
 
 
diff --git a/kombu/five.py b/kombu/five.py
index 1005fef2..0b4d38e7 100644
--- a/kombu/five.py
+++ b/kombu/five.py
@@ -3,6 +3,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import sys
+
 import vine.five
 
 sys.modules[__name__] = vine.five
diff --git a/kombu/log.py b/kombu/log.py
index 569cb09b..6d9e4ac7 100644
--- a/kombu/log.py
+++ b/kombu/log.py
@@ -5,7 +5,6 @@ import logging
 import numbers
 import os
 import sys
-
 from logging.handlers import WatchedFileHandler
 
 from .five import string_t
diff --git a/kombu/messaging.py b/kombu/messaging.py
index 265897fc..2cda66ce 100644
--- a/kombu/messaging.py
+++ b/kombu/messaging.py
@@ -5,7 +5,7 @@ from itertools import count
 
 from .common import maybe_declare
 from .compression import compress
-from .connection import maybe_channel, is_connection
+from .connection import is_connection, maybe_channel
 from .entity import Exchange, Queue, maybe_delivery_mode
 from .exceptions import ContentDisallowed
 from .five import items, python_2_unicode_compatible, text_t, values
diff --git a/kombu/mixins.py b/kombu/mixins.py
index 4acde4c7..899359a4 100644
--- a/kombu/mixins.py
+++ b/kombu/mixins.py
@@ -3,7 +3,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import socket
-
 from contextlib import contextmanager
 from functools import partial
 from itertools import count
@@ -11,8 +10,8 @@ from time import sleep
 
 from .common import ignore_errors
 from .five import range
-from .messaging import Consumer, Producer
 from .log import get_logger
+from .messaging import Consumer, Producer
 from .utils.compat import nested
 from .utils.encoding import safe_repr
 from .utils.limits import TokenBucket
diff --git a/kombu/pidbox.py b/kombu/pidbox.py
index a287c498..0b43cc9d 100644
--- a/kombu/pidbox.py
+++ b/kombu/pidbox.py
@@ -3,7 +3,6 @@ from __future__ import absolute_import, unicode_literals
 
 import socket
 import warnings
-
 from collections import defaultdict, deque
 from contextlib import contextmanager
 from copy import copy
@@ -11,7 +10,7 @@ from itertools import count
 from threading import local
 from time import time
 
-from . import Exchange, Queue, Consumer, Producer
+from . import Consumer, Exchange, Producer, Queue
 from .clocks import LamportClock
 from .common import maybe_declare, oid_from
 from .exceptions import InconsistencyError
diff --git a/kombu/pools.py b/kombu/pools.py
index 862780d9..7125ce8d 100644
--- a/kombu/pools.py
+++ b/kombu/pools.py
@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
-
 from itertools import chain
 
 from .connection import Resource
@@ -107,6 +106,8 @@ class Connections(PoolGroup):
 
     def create(self, connection, limit):
         return connection.Pool(limit=limit)
+
+
 connections = register_group(Connections(limit=use_global_limit))  # noqa: E305
 
 
@@ -115,6 +116,8 @@ class Producers(PoolGroup):
 
     def create(self, connection, limit):
         return ProducerPool(connections[connection], limit=limit)
+
+
 producers = register_group(Producers(limit=use_global_limit))  # noqa: E305
 
 
diff --git a/kombu/resource.py b/kombu/resource.py
index 1d13edcb..2df113bb 100644
--- a/kombu/resource.py
+++ b/kombu/resource.py
@@ -2,11 +2,11 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
-
 from collections import deque
 
 from . import exceptions
-from .five import Empty, LifoQueue as _LifoQueue
+from .five import Empty
+from .five import LifoQueue as _LifoQueue
 from .utils.compat import register_after_fork
 from .utils.functional import lazy
 
diff --git a/kombu/serialization.py b/kombu/serialization.py
index e05ae67e..fdc7c21d 100644
--- a/kombu/serialization.py
+++ b/kombu/serialization.py
@@ -3,24 +3,23 @@ from __future__ import absolute_import, unicode_literals
 
 import codecs
 import os
-import sys
-
 import pickle as pypickle
-try:
-    import cPickle as cpickle
-except ImportError:  # pragma: no cover
-    cpickle = None  # noqa
-
+import sys
 from collections import namedtuple
 from contextlib import contextmanager
 from io import BytesIO
 
-from .exceptions import (
-    ContentDisallowed, DecodeError, EncodeError, SerializerNotInstalled
-)
+from .exceptions import (ContentDisallowed, DecodeError, EncodeError,
+                         SerializerNotInstalled)
 from .five import reraise, text_t
 from .utils.compat import entrypoints
-from .utils.encoding import bytes_to_str, str_to_bytes, bytes_t
+from .utils.encoding import bytes_t, bytes_to_str, str_to_bytes
+
+try:
+    import cPickle as cpickle
+except ImportError:  # pragma: no cover
+    cpickle = None  # noqa
+
 
 __all__ = ['pickle', 'loads', 'dumps', 'register', 'unregister']
 SKIP_DECODE = frozenset(['binary', 'ascii-8bit'])
diff --git a/kombu/simple.py b/kombu/simple.py
index 29bf7474..20b1d557 100644
--- a/kombu/simple.py
+++ b/kombu/simple.py
@@ -2,11 +2,9 @@
 from __future__ import absolute_import, unicode_literals
 
 import socket
-
 from collections import deque
 
-from . import entity
-from . import messaging
+from . import entity, messaging
 from .connection import maybe_channel
 from .five import Empty, monotonic
 
diff --git a/kombu/transport/SLMQ.py b/kombu/transport/SLMQ.py
index 5848f720..ed8bd938 100644
--- a/kombu/transport/SLMQ.py
+++ b/kombu/transport/SLMQ.py
@@ -1,14 +1,13 @@
 """SoftLayer Message Queue transport."""
 from __future__ import absolute_import, unicode_literals
 
+import os
 import socket
 import string
 
-import os
-
 from kombu.five import Empty, text_t
 from kombu.utils.encoding import bytes_to_str, safe_str
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 
 from . import virtual
diff --git a/kombu/transport/SQS.py b/kombu/transport/SQS.py
index c3e19203..a575effd 100644
--- a/kombu/transport/SQS.py
+++ b/kombu/transport/SQS.py
@@ -42,7 +42,7 @@ import socket
 import string
 import uuid
 
-from vine import transform, ensure_promise, promise
+from vine import ensure_promise, promise, transform
 
 from kombu.asynchronous import get_event_loop
 from kombu.asynchronous.aws.ext import boto3, exceptions
@@ -52,7 +52,7 @@ from kombu.five import Empty, range, string_t, text_t
 from kombu.log import get_logger
 from kombu.utils import scheduling
 from kombu.utils.encoding import bytes_to_str, safe_str
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 
 from . import virtual
diff --git a/kombu/transport/consul.py b/kombu/transport/consul.py
index 26dca7ac..033a5c16 100644
--- a/kombu/transport/consul.py
+++ b/kombu/transport/consul.py
@@ -6,16 +6,15 @@ It uses python-consul for talking to Consul's HTTP API
 """
 from __future__ import absolute_import, unicode_literals
 
-import uuid
 import socket
-
+import uuid
 from collections import defaultdict
 from contextlib import contextmanager
 
 from kombu.exceptions import ChannelError
 from kombu.five import Empty, monotonic
 from kombu.log import get_logger
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 
 from . import virtual
diff --git a/kombu/transport/etcd.py b/kombu/transport/etcd.py
index 025c1d7a..a55be3a7 100644
--- a/kombu/transport/etcd.py
+++ b/kombu/transport/etcd.py
@@ -8,14 +8,13 @@ from __future__ import absolute_import, unicode_literals
 
 import os
 import socket
-
 from collections import defaultdict
 from contextlib import contextmanager
 
 from kombu.exceptions import ChannelError
 from kombu.five import Empty
 from kombu.log import get_logger
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 
 from . import virtual
diff --git a/kombu/transport/filesystem.py b/kombu/transport/filesystem.py
index b27dfdb8..4f7730b2 100644
--- a/kombu/transport/filesystem.py
+++ b/kombu/transport/filesystem.py
@@ -6,16 +6,16 @@ from __future__ import absolute_import, unicode_literals
 
 import os
 import shutil
-import uuid
 import tempfile
+import uuid
 
-from . import virtual
 from kombu.exceptions import ChannelError
 from kombu.five import Empty, monotonic
 from kombu.utils.encoding import bytes_to_str, str_to_bytes
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 
+from . import virtual
 
 VERSION = (1, 0, 0)
 __version__ = '.'.join(map(str, VERSION))
diff --git a/kombu/transport/librabbitmq.py b/kombu/transport/librabbitmq.py
index fbe29d1b..6f48a62d 100644
--- a/kombu/transport/librabbitmq.py
+++ b/kombu/transport/librabbitmq.py
@@ -9,11 +9,10 @@ import socket
 import warnings
 
 import librabbitmq as amqp
-from librabbitmq import ChannelError, ConnectionError
-
 from kombu.five import items, values
 from kombu.utils.amq_manager import get_manager
 from kombu.utils.text import version_string_as_tuple
+from librabbitmq import ChannelError, ConnectionError
 
 from . import base
 from .base import to_rabbitmq_queue_arguments
diff --git a/kombu/transport/memory.py b/kombu/transport/memory.py
index 0674e288..be8d88ec 100644
--- a/kombu/transport/memory.py
+++ b/kombu/transport/memory.py
@@ -3,8 +3,7 @@ from __future__ import absolute_import, unicode_literals
 
 from kombu.five import Queue, values
 
-from . import base
-from . import virtual
+from . import base, virtual
 
 
 class Channel(virtual.Channel):
diff --git a/kombu/transport/mongodb.py b/kombu/transport/mongodb.py
index f542dfc9..d2180f99 100644
--- a/kombu/transport/mongodb.py
+++ b/kombu/transport/mongodb.py
@@ -8,16 +8,14 @@ from __future__ import absolute_import, unicode_literals
 import datetime
 
 import pymongo
-from pymongo import errors
-from pymongo import MongoClient, uri_parser
-from pymongo.cursor import CursorType
-
 from kombu.exceptions import VersionMismatch
 from kombu.five import Empty, string_t
 from kombu.utils.compat import _detect_environment
 from kombu.utils.encoding import bytes_to_str
-from kombu.utils.json import loads, dumps
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
+from pymongo import MongoClient, errors, uri_parser
+from pymongo.cursor import CursorType
 
 from . import virtual
 
diff --git a/kombu/transport/qpid.py b/kombu/transport/qpid.py
index bd627ded..72bb39f0 100644
--- a/kombu/transport/qpid.py
+++ b/kombu/transport/qpid.py
@@ -78,18 +78,22 @@ Celery, this can be accomplished by setting the
 """
 from __future__ import absolute_import, unicode_literals
 
-from collections import OrderedDict
 import os
 import select
 import socket
 import ssl
 import sys
 import uuid
-
+from collections import OrderedDict
 from gettext import gettext as _
 
 import amqp.protocol
 
+from kombu.five import PY3, Empty, items, monotonic
+from kombu.log import get_logger
+from kombu.transport import base
+from kombu.transport.virtual import Base64, Message
+
 try:
     import fcntl
 except ImportError:
@@ -116,12 +120,6 @@ except ImportError:  # pragma: no cover
     qpid = None
 
 
-from kombu.five import Empty, items, monotonic, PY3
-from kombu.log import get_logger
-from kombu.transport.virtual import Base64, Message
-from kombu.transport import base
-
-
 logger = get_logger(__name__)
 
 
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index 39a6e340..5a523cdc 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -3,7 +3,6 @@ from __future__ import absolute_import, unicode_literals
 
 import numbers
 import socket
-
 from bisect import bisect
 from collections import namedtuple
 from contextlib import contextmanager
@@ -12,12 +11,12 @@ from time import time
 from vine import promise
 
 from kombu.exceptions import InconsistencyError, VersionMismatch
-from kombu.five import Empty, values, string_t
+from kombu.five import Empty, string_t, values
 from kombu.log import get_logger
 from kombu.utils.compat import register_after_fork
-from kombu.utils.eventio import poll, READ, ERR
 from kombu.utils.encoding import bytes_to_str
-from kombu.utils.json import loads, dumps
+from kombu.utils.eventio import ERR, READ, poll
+from kombu.utils.json import dumps, loads
 from kombu.utils.objects import cached_property
 from kombu.utils.scheduling import cycle_by_name
 from kombu.utils.url import _parse_url
diff --git a/kombu/transport/sqlalchemy/models.py b/kombu/transport/sqlalchemy/models.py
index 5fd56c0c..21b4cbda 100644
--- a/kombu/transport/sqlalchemy/models.py
+++ b/kombu/transport/sqlalchemy/models.py
@@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals
 
 import datetime
 
-from sqlalchemy import (Column, Integer, String, Text, DateTime,
-                        Sequence, Boolean, ForeignKey, SmallInteger)
+from sqlalchemy import (Boolean, Column, DateTime, ForeignKey, Integer,
+                        Sequence, SmallInteger, String, Text)
 from sqlalchemy.ext.declarative import declarative_base, declared_attr
 from sqlalchemy.orm import relation
 from sqlalchemy.schema import MetaData
diff --git a/kombu/transport/virtual/base.py b/kombu/transport/virtual/base.py
index 089a256b..4a539e15 100644
--- a/kombu/transport/virtual/base.py
+++ b/kombu/transport/virtual/base.py
@@ -8,7 +8,6 @@ import base64
 import socket
 import sys
 import warnings
-
 from array import array
 from collections import OrderedDict, defaultdict, namedtuple
 from itertools import count
@@ -17,16 +16,15 @@ from time import sleep
 
 from amqp.protocol import queue_declare_ok_t
 
-from kombu.exceptions import ResourceError, ChannelError
+from kombu.exceptions import ChannelError, ResourceError
 from kombu.five import Empty, items, monotonic
 from kombu.log import get_logger
-from kombu.utils.encoding import str_to_bytes, bytes_to_str
+from kombu.transport import base
 from kombu.utils.div import emergency_dump_state
+from kombu.utils.encoding import bytes_to_str, str_to_bytes
 from kombu.utils.scheduling import FairCycle
 from kombu.utils.uuid import uuid
 
-from kombu.transport import base
-
 from .exchange import STANDARD_EXCHANGE_TYPES
 
 ARRAY_TYPE_H = 'H' if sys.version_info[0] == 3 else b'H'
diff --git a/kombu/utils/compat.py b/kombu/utils/compat.py
index ff35f36b..a41201f2 100644
--- a/kombu/utils/compat.py
+++ b/kombu/utils/compat.py
@@ -3,10 +3,8 @@ from __future__ import absolute_import, unicode_literals
 
 import numbers
 import sys
-
-from functools import wraps
-
 from contextlib import contextmanager
+from functools import wraps
 
 from kombu.five import reraise
 
diff --git a/kombu/utils/div.py b/kombu/utils/div.py
index db52048c..6ea6fa56 100644
--- a/kombu/utils/div.py
+++ b/kombu/utils/div.py
@@ -1,10 +1,10 @@
 """Div. Utilities."""
-from __future__ import absolute_import, unicode_literals, print_function
-
-from .encoding import default_encode
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 
+from .encoding import default_encode
+
 
 def emergency_dump_state(state, open_file=open, dump=None, stderr=None):
     """Dump message state to stdout or file."""
diff --git a/kombu/utils/encoding.py b/kombu/utils/encoding.py
index 93788bde..3742ea70 100644
--- a/kombu/utils/encoding.py
+++ b/kombu/utils/encoding.py
@@ -12,7 +12,6 @@ import traceback
 
 from kombu.five import PY3, text_t
 
-
 #: safe_str takes encoding from this file by default.
 #: :func:`set_default_encoding_file` can used to set the
 #: default output file.
@@ -126,7 +125,6 @@ else:
             return s.decode(encoding, errors)
         return s
 
-
     def _safe_str(s, errors='replace', file=None):  # noqa
         encoding = default_encoding(file)
         try:
diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py
index 523d8d67..9c1e56d8 100644
--- a/kombu/utils/eventio.py
+++ b/kombu/utils/eventio.py
@@ -6,7 +6,6 @@ import math
 import select as __select__
 import socket
 import sys
-
 from numbers import Integral
 
 from . import fileno
@@ -133,8 +132,8 @@ class _kqueue(object):
         kevents = []
         if events & WRITE:
             kevents.append(kevent(fd,
-                           filter=KQ_FILTER_WRITE,
-                           flags=flags))
+                                  filter=KQ_FILTER_WRITE,
+                                  flags=flags))
         if not kevents or events & READ:
             kevents.append(
                 kevent(fd, filter=KQ_FILTER_READ, flags=flags),
diff --git a/kombu/utils/functional.py b/kombu/utils/functional.py
index 750d5dba..781cfdfb 100644
--- a/kombu/utils/functional.py
+++ b/kombu/utils/functional.py
@@ -4,16 +4,14 @@ from __future__ import absolute_import, unicode_literals
 import random
 import sys
 import threading
-
 from collections import Iterable, Mapping, OrderedDict
 from itertools import count, repeat
 from time import sleep
 
 from vine.utils import wraps
 
-from kombu.five import (
-    UserDict, items, keys, python_2_unicode_compatible, string_t,
-)
+from kombu.five import (UserDict, items, keys, python_2_unicode_compatible,
+                        string_t)
 
 from .encoding import safe_repr as _safe_repr
 
diff --git a/kombu/utils/json.py b/kombu/utils/json.py
index b2466a45..4c362642 100644
--- a/kombu/utils/json.py
+++ b/kombu/utils/json.py
@@ -7,7 +7,7 @@ import decimal
 import json as stdjson
 import uuid
 
-from kombu.five import PY3, buffer_t, text_t, bytes_t
+from kombu.five import PY3, buffer_t, bytes_t, text_t
 
 try:
     from django.utils.functional import Promise as DjangoPromise
diff --git a/kombu/utils/url.py b/kombu/utils/url.py
index fbc90a14..c4310856 100644
--- a/kombu/utils/url.py
+++ b/kombu/utils/url.py
@@ -4,15 +4,16 @@ from __future__ import absolute_import, unicode_literals
 from collections import Mapping
 from functools import partial
 
+from kombu.five import bytes_if_py2, string_t
+
+from .compat import NamedTuple
+
 try:
     from urllib.parse import parse_qsl, quote, unquote, urlparse
 except ImportError:
     from urllib import quote, unquote                  # noqa
     from urlparse import urlparse, parse_qsl    # noqa
 
-from kombu.five import bytes_if_py2, string_t
-
-from .compat import NamedTuple
 
 safequote = partial(quote, safe=bytes_if_py2(''))
 
@@ -55,6 +56,8 @@ def url_to_parts(url):
         unquote(path or '') or None,
         dict(parse_qsl(parts.query)),
     )
+
+
 _parse_url = url_to_parts  # noqa
 
 
diff --git a/t/integration/tests/test_SLMQ.py b/t/integration/tests/test_SLMQ.py
index 33ba76ad..1ad31086 100644
--- a/t/integration/tests/test_SLMQ.py
+++ b/t/integration/tests/test_SLMQ.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_SQS.py b/t/integration/tests/test_SQS.py
index 4949bcad..a64d3807 100644
--- a/t/integration/tests/test_SQS.py
+++ b/t/integration/tests/test_SQS.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_librabbitmq.py b/t/integration/tests/test_librabbitmq.py
index 11840ca1..f319ccf7 100644
--- a/t/integration/tests/test_librabbitmq.py
+++ b/t/integration/tests/test_librabbitmq.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_mongodb.py b/t/integration/tests/test_mongodb.py
index dcf00ef1..a7c2cc25 100644
--- a/t/integration/tests/test_mongodb.py
+++ b/t/integration/tests/test_mongodb.py
@@ -1,12 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
-from kombu import Consumer, Producer, Exchange, Queue
-from kombu.five import range
-from kombu.utils.compat import nested
-
 from funtests import transport
-
+from kombu import Consumer, Exchange, Producer, Queue
+from kombu.five import range
 from kombu.tests.case import skip
+from kombu.utils.compat import nested
 
 
 @skip.unless_module('pymongo')
diff --git a/t/integration/tests/test_qpid.py b/t/integration/tests/test_qpid.py
index d7e53e82..08546649 100644
--- a/t/integration/tests/test_qpid.py
+++ b/t/integration/tests/test_qpid.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_redis.py b/t/integration/tests/test_redis.py
index 48c3916e..8ca5c205 100644
--- a/t/integration/tests/test_redis.py
+++ b/t/integration/tests/test_redis.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_sqla.py b/t/integration/tests/test_sqla.py
index f145c07e..9e01d754 100644
--- a/t/integration/tests/test_sqla.py
+++ b/t/integration/tests/test_sqla.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/tests/test_zookeeper.py b/t/integration/tests/test_zookeeper.py
index 147bfdc9..834a0453 100644
--- a/t/integration/tests/test_zookeeper.py
+++ b/t/integration/tests/test_zookeeper.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from funtests import transport
-
 from kombu.tests.case import skip
 
 
diff --git a/t/integration/transport.py b/t/integration/transport.py
index ef3186a7..4f05052b 100644
--- a/t/integration/transport.py
+++ b/t/integration/transport.py
@@ -7,13 +7,11 @@ import time
 import unittest
 import warnings
 import weakref
+from hashlib import sha256 as _digest
 
 from case.skip import SkipTest
 
-from hashlib import sha256 as _digest
-
-from kombu import Connection
-from kombu import Exchange, Queue
+from kombu import Connection, Exchange, Queue
 from kombu.five import buffer_t, range
 from kombu.utils.encoding import str_to_bytes
 
@@ -167,7 +165,7 @@ class TransportCase(unittest.TestCase):
             return
         bytes = min(x for x in [bytes, self.message_size_limit] if x)
         messages = [''.join(random.choice(charset)
-                    for j in range(bytes)) + '--%s' % n
+                            for j in range(bytes)) + '--%s' % n
                     for i in range(n)]
         digests = []
         chan1 = self.connection.channel()
diff --git a/t/unit/asynchronous/aws/case.py b/t/unit/asynchronous/aws/case.py
index 70d9565f..38e9633c 100644
--- a/t/unit/asynchronous/aws/case.py
+++ b/t/unit/asynchronous/aws/case.py
@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import skip
 
 
diff --git a/t/unit/asynchronous/aws/sqs/test_connection.py b/t/unit/asynchronous/aws/sqs/test_connection.py
index ca1a8868..ef70da0c 100644
--- a/t/unit/asynchronous/aws/sqs/test_connection.py
+++ b/t/unit/asynchronous/aws/sqs/test_connection.py
@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-from case import Mock, MagicMock
+from case import MagicMock, Mock
 
-from kombu.asynchronous.aws.sqs.connection import (
-    AsyncSQSConnection
-)
 from kombu.asynchronous.aws.ext import boto3
+from kombu.asynchronous.aws.sqs.connection import AsyncSQSConnection
 from kombu.asynchronous.aws.sqs.message import AsyncMessage
 from kombu.asynchronous.aws.sqs.queue import AsyncQueue
 from kombu.utils.uuid import uuid
-
 from t.mocks import PromiseMock
 
 from ..case import AWSCase
diff --git a/t/unit/asynchronous/aws/sqs/test_queue.py b/t/unit/asynchronous/aws/sqs/test_queue.py
index add591df..2e3684d8 100644
--- a/t/unit/asynchronous/aws/sqs/test_queue.py
+++ b/t/unit/asynchronous/aws/sqs/test_queue.py
@@ -2,12 +2,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu.asynchronous.aws.sqs.message import AsyncMessage
 from kombu.asynchronous.aws.sqs.queue import AsyncQueue
-
 from t.mocks import PromiseMock
 
 from ..case import AWSCase
diff --git a/t/unit/asynchronous/aws/test_connection.py b/t/unit/asynchronous/aws/test_connection.py
index b378c020..1ee6c863 100644
--- a/t/unit/asynchronous/aws/test_connection.py
+++ b/t/unit/asynchronous/aws/test_connection.py
@@ -6,22 +6,18 @@ from contextlib import contextmanager
 from case import Mock
 from vine.abstract import Thenable
 
-from kombu.exceptions import HttpError
-from kombu.five import WhateverIO
-
 from kombu.asynchronous import http
-from kombu.asynchronous.aws.connection import (
-    AsyncHTTPSConnection,
-    AsyncHTTPResponse,
-    AsyncConnection,
-    AsyncAWSQueryConnection,
-)
+from kombu.asynchronous.aws.connection import (AsyncAWSQueryConnection,
+                                               AsyncConnection,
+                                               AsyncHTTPResponse,
+                                               AsyncHTTPSConnection)
 from kombu.asynchronous.aws.ext import boto3
+from kombu.exceptions import HttpError
+from kombu.five import WhateverIO
+from t.mocks import PromiseMock
 
 from .case import AWSCase
 
-from t.mocks import PromiseMock
-
 try:
     from urllib.parse import urlparse, parse_qs
 except ImportError:
diff --git a/t/unit/asynchronous/http/test_curl.py b/t/unit/asynchronous/http/test_curl.py
index 553b0ea7..0e14ae62 100644
--- a/t/unit/asynchronous/http/test_curl.py
+++ b/t/unit/asynchronous/http/test_curl.py
@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock, call, patch, skip
 
 from kombu.asynchronous.http.curl import READ, WRITE, CurlClient
diff --git a/t/unit/asynchronous/http/test_http.py b/t/unit/asynchronous/http/test_http.py
index 21c66b97..f5b93bba 100644
--- a/t/unit/asynchronous/http/test_http.py
+++ b/t/unit/asynchronous/http/test_http.py
@@ -1,17 +1,14 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
-
 from io import BytesIO
 
-from vine import promise
-
+import pytest
 from case import Mock, skip
+from vine import promise
 
 from kombu.asynchronous import http
 from kombu.asynchronous.http.base import BaseClient, normalize_header
 from kombu.exceptions import HttpError
-
 from t.mocks import PromiseMock
 
 
diff --git a/t/unit/asynchronous/test_hub.py b/t/unit/asynchronous/test_hub.py
index e09a2926..9460f7de 100644
--- a/t/unit/asynchronous/test_hub.py
+++ b/t/unit/asynchronous/test_hub.py
@@ -1,18 +1,16 @@
 from __future__ import absolute_import, unicode_literals
 
 import errno
-import pytest
 
+import pytest
 from case import Mock, call, patch
 from vine import promise
 
+from kombu.asynchronous import ERR, READ, WRITE, Hub
 from kombu.asynchronous import hub as _hub
-from kombu.asynchronous import Hub, READ, WRITE, ERR
-from kombu.asynchronous.debug import callback_for, repr_flag, _rcb
-from kombu.asynchronous.hub import (
-    Stop, get_event_loop, set_event_loop,
-    _raise_stop_error, _dummy_context
-)
+from kombu.asynchronous.debug import _rcb, callback_for, repr_flag
+from kombu.asynchronous.hub import (Stop, _dummy_context, _raise_stop_error,
+                                    get_event_loop, set_event_loop)
 from kombu.asynchronous.semaphore import DummyLock, LaxBoundedSemaphore
 
 
diff --git a/t/unit/asynchronous/test_timer.py b/t/unit/asynchronous/test_timer.py
index 8ceb725f..61cb86fd 100644
--- a/t/unit/asynchronous/test_timer.py
+++ b/t/unit/asynchronous/test_timer.py
@@ -1,9 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
-
 from datetime import datetime
 
+import pytest
 from case import Mock, patch
 
 from kombu.asynchronous.timer import Entry, Timer, to_timestamp
diff --git a/t/unit/conftest.py b/t/unit/conftest.py
index c7224ce5..a88bbf1d 100644
--- a/t/unit/conftest.py
+++ b/t/unit/conftest.py
@@ -2,9 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 import atexit
 import os
-import pytest
 import sys
 
+import pytest
+
 from kombu.exceptions import VersionMismatch
 
 
diff --git a/t/unit/test_clocks.py b/t/unit/test_clocks.py
index 5ed30bf1..1709efc3 100644
--- a/t/unit/test_clocks.py
+++ b/t/unit/test_clocks.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-
 from heapq import heappush
 from time import time
 
diff --git a/t/unit/test_common.py b/t/unit/test_common.py
index 9cc30d15..85d4641e 100644
--- a/t/unit/test_common.py
+++ b/t/unit/test_common.py
@@ -1,19 +1,15 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import socket
 
+import pytest
 from amqp import RecoverableConnectionError
 from case import ContextMock, Mock, patch
 
 from kombu import common
-from kombu.common import (
-    Broadcast, maybe_declare,
-    send_reply, collect_replies,
-    declaration_cached, ignore_errors,
-    QoS, PREFETCH_COUNT_MAX, generate_oid
-)
-
+from kombu.common import (PREFETCH_COUNT_MAX, Broadcast, QoS, collect_replies,
+                          declaration_cached, generate_oid, ignore_errors,
+                          maybe_declare, send_reply)
 from t.mocks import MockPool
 
 
diff --git a/t/unit/test_compat.py b/t/unit/test_compat.py
index 485625d0..54f6f3ac 100644
--- a/t/unit/test_compat.py
+++ b/t/unit/test_compat.py
@@ -1,13 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock, patch
 
-from kombu import Connection, Exchange, Queue
-from kombu import compat
-
-from t.mocks import Transport, Channel
+from kombu import Connection, Exchange, Queue, compat
+from t.mocks import Channel, Transport
 
 
 class test_misc:
diff --git a/t/unit/test_connection.py b/t/unit/test_connection.py
index 04a20ff3..7e0433f5 100644
--- a/t/unit/test_connection.py
+++ b/t/unit/test_connection.py
@@ -1,11 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-import pytest
 import socket
-
 from copy import copy, deepcopy
 
+import pytest
 from case import Mock, patch, skip
 
 from kombu import Connection, Consumer, Producer, parse_url
@@ -13,7 +12,6 @@ from kombu.connection import Resource
 from kombu.exceptions import OperationalError
 from kombu.five import items, range
 from kombu.utils.functional import lazy
-
 from t.mocks import Transport
 
 
diff --git a/t/unit/test_entity.py b/t/unit/test_entity.py
index f1133c1b..f4e93369 100644
--- a/t/unit/test_entity.py
+++ b/t/unit/test_entity.py
@@ -1,15 +1,14 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-import pytest
 
+import pytest
 from case import Mock, call
 
 from kombu import Connection, Exchange, Producer, Queue, binding
 from kombu.abstract import MaybeChannelBound
 from kombu.exceptions import NotBoundError
 from kombu.serialization import registry
-
 from t.mocks import Transport
 
 
diff --git a/t/unit/test_log.py b/t/unit/test_log.py
index 772b520d..04ef35ae 100644
--- a/t/unit/test_log.py
+++ b/t/unit/test_log.py
@@ -5,14 +5,8 @@ import sys
 
 from case import ANY, Mock, patch
 
-from kombu.log import (
-    get_logger,
-    get_loglevel,
-    safeify_format,
-    Log,
-    LogMixin,
-    setup_logging,
-)
+from kombu.log import (Log, LogMixin, get_logger, get_loglevel, safeify_format,
+                       setup_logging)
 
 
 class test_get_logger:
diff --git a/t/unit/test_message.py b/t/unit/test_message.py
index c7d2b5f5..e531dfbe 100644
--- a/t/unit/test_message.py
+++ b/t/unit/test_message.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import sys
 
+import pytest
 from case import Mock, patch
 
 from kombu.message import Message
diff --git a/t/unit/test_messaging.py b/t/unit/test_messaging.py
index 7ca790c9..7c33b062 100644
--- a/t/unit/test_messaging.py
+++ b/t/unit/test_messaging.py
@@ -1,18 +1,16 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-import pytest
 import sys
-
 from collections import defaultdict
 
+import pytest
 from case import Mock, patch
 
-from kombu import Connection, Consumer, Producer, Exchange, Queue
+from kombu import Connection, Consumer, Exchange, Producer, Queue
 from kombu.exceptions import MessageStateError
 from kombu.utils import json
 from kombu.utils.functional import ChannelPromise
-
 from t.mocks import Transport
 
 
diff --git a/t/unit/test_mixins.py b/t/unit/test_mixins.py
index 372399e4..8a6566bf 100644
--- a/t/unit/test_mixins.py
+++ b/t/unit/test_mixins.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import socket
 
+import pytest
 from case import ContextMock, Mock, patch
 
 from kombu.mixins import ConsumerMixin
diff --git a/t/unit/test_pidbox.py b/t/unit/test_pidbox.py
index c2dfccb0..f8f3e67b 100644
--- a/t/unit/test_pidbox.py
+++ b/t/unit/test_pidbox.py
@@ -1,13 +1,12 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import socket
 import warnings
 
+import pytest
 from case import Mock, patch
 
-from kombu import Connection
-from kombu import pidbox
+from kombu import Connection, pidbox
 from kombu.exceptions import ContentDisallowed, InconsistencyError
 from kombu.utils.uuid import uuid
 
diff --git a/t/unit/test_pools.py b/t/unit/test_pools.py
index 18719688..70d09473 100644
--- a/t/unit/test_pools.py
+++ b/t/unit/test_pools.py
@@ -1,11 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
-from kombu import Connection, Producer
-from kombu import pools
+from kombu import Connection, Producer, pools
 from kombu.connection import ConnectionPool
 from kombu.utils.collections import eqhash
 
diff --git a/t/unit/test_serialization.py b/t/unit/test_serialization.py
index 88af0860..7a0effd3 100644
--- a/t/unit/test_serialization.py
+++ b/t/unit/test_serialization.py
@@ -2,22 +2,20 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import sys
-
 from base64 import b64decode
 
+import pytest
 from case import call, mock, patch, skip
 
-from kombu.exceptions import ContentDisallowed, EncodeError, DecodeError
-from kombu.five import text_t, bytes_t
-from kombu.serialization import (
-    registry, register, SerializerNotInstalled,
-    raw_encode, register_yaml, register_msgpack,
-    dumps, loads, pickle, pickle_protocol,
-    unregister, register_pickle, enable_insecure_serializers,
-    disable_insecure_serializers,
-)
+from kombu.exceptions import ContentDisallowed, DecodeError, EncodeError
+from kombu.five import bytes_t, text_t
+from kombu.serialization import (SerializerNotInstalled,
+                                 disable_insecure_serializers, dumps,
+                                 enable_insecure_serializers, loads, pickle,
+                                 pickle_protocol, raw_encode, register,
+                                 register_msgpack, register_pickle,
+                                 register_yaml, registry, unregister)
 from kombu.utils.encoding import str_to_bytes
 
 # For content_encoding tests
diff --git a/t/unit/test_simple.py b/t/unit/test_simple.py
index f36a8bef..2e0ee8d7 100644
--- a/t/unit/test_simple.py
+++ b/t/unit/test_simple.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu import Connection, Exchange, Queue
diff --git a/t/unit/transport/test_SQS.py b/t/unit/transport/test_SQS.py
index 4ccf3292..94274a89 100644
--- a/t/unit/transport/test_SQS.py
+++ b/t/unit/transport/test_SQS.py
@@ -7,15 +7,13 @@ slightly.
 
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import random
 import string
 
+import pytest
 from case import Mock, skip
 
-from kombu import messaging
-from kombu import Connection, Exchange, Queue
-
+from kombu import Connection, Exchange, Queue, messaging
 from kombu.five import Empty
 from kombu.transport import SQS
 
diff --git a/t/unit/transport/test_base.py b/t/unit/transport/test_base.py
index 31c2f5a9..8d0b6816 100644
--- a/t/unit/transport/test_base.py
+++ b/t/unit/transport/test_base.py
@@ -1,15 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu import Connection, Consumer, Exchange, Producer, Queue
 from kombu.five import text_t
 from kombu.message import Message
-from kombu.transport.base import (
-    StdChannel, Transport, Management, to_rabbitmq_queue_arguments,
-)
+from kombu.transport.base import (Management, StdChannel, Transport,
+                                  to_rabbitmq_queue_arguments)
 
 
 @pytest.mark.parametrize('args,input,expected', [
diff --git a/t/unit/transport/test_consul.py b/t/unit/transport/test_consul.py
index 43b2b165..d532b344 100644
--- a/t/unit/transport/test_consul.py
+++ b/t/unit/transport/test_consul.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock, skip
 
 from kombu.five import Empty
diff --git a/t/unit/transport/test_etcd.py b/t/unit/transport/test_etcd.py
index b61fd7a7..182153de 100644
--- a/t/unit/transport/test_etcd.py
+++ b/t/unit/transport/test_etcd.py
@@ -1,11 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock, patch, skip
 
 from kombu.five import Empty
-
 from kombu.transport.etcd import Channel, Transport
 
 
diff --git a/t/unit/transport/test_filesystem.py b/t/unit/transport/test_filesystem.py
index 52a925f0..08da9d61 100644
--- a/t/unit/transport/test_filesystem.py
+++ b/t/unit/transport/test_filesystem.py
@@ -5,7 +5,7 @@ import tempfile
 from case import skip
 from case.skip import SkipTest
 
-from kombu import Connection, Exchange, Queue, Consumer, Producer
+from kombu import Connection, Consumer, Exchange, Producer, Queue
 
 
 @skip.if_win32()
diff --git a/t/unit/transport/test_librabbitmq.py b/t/unit/transport/test_librabbitmq.py
index 26dbfbcd..6855271b 100644
--- a/t/unit/transport/test_librabbitmq.py
+++ b/t/unit/transport/test_librabbitmq.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock, patch, skip
 
 try:
diff --git a/t/unit/transport/test_memory.py b/t/unit/transport/test_memory.py
index 5d3bf6fc..de83884c 100644
--- a/t/unit/transport/test_memory.py
+++ b/t/unit/transport/test_memory.py
@@ -1,9 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import socket
 
-from kombu import Connection, Exchange, Queue, Consumer, Producer
+import pytest
+
+from kombu import Connection, Consumer, Exchange, Producer, Queue
 
 
 class test_MemoryTransport:
diff --git a/t/unit/transport/test_mongodb.py b/t/unit/transport/test_mongodb.py
index 4509497a..8f2341a9 100644
--- a/t/unit/transport/test_mongodb.py
+++ b/t/unit/transport/test_mongodb.py
@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 import datetime
-import pytest
 
+import pytest
 from case import MagicMock, call, patch, skip
 
 from kombu import Connection
diff --git a/t/unit/transport/test_pyamqp.py b/t/unit/transport/test_pyamqp.py
index 82929916..0c3fa479 100644
--- a/t/unit/transport/test_pyamqp.py
+++ b/t/unit/transport/test_pyamqp.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import sys
-
 from itertools import count
 
 from case import Mock, mock, patch
diff --git a/t/unit/transport/test_qpid.py b/t/unit/transport/test_qpid.py
index 5ca4f38a..e0f27358 100644
--- a/t/unit/transport/test_qpid.py
+++ b/t/unit/transport/test_qpid.py
@@ -1,25 +1,23 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import select
-import ssl
 import socket
+import ssl
 import sys
 import time
 import uuid
-
 from collections import Callable, OrderedDict
 from itertools import count
 
+import pytest
 from case import Mock, call, patch, skip
 
-from kombu.five import Empty, keys, range, monotonic
+from kombu.five import Empty, keys, monotonic, range
 from kombu.transport.qpid import (AuthenticationFailure, Channel, Connection,
                                   ConnectionError, Message, NotFound, QoS,
                                   Transport)
 from kombu.transport.virtual import Base64
 
-
 QPID_MODULE = 'kombu.transport.qpid'
 
 
diff --git a/t/unit/transport/test_redis.py b/t/unit/transport/test_redis.py
index be84ba4c..1dd41bb0 100644
--- a/t/unit/transport/test_redis.py
+++ b/t/unit/transport/test_redis.py
@@ -1,17 +1,20 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import socket
 import types
-
 from collections import defaultdict
 from itertools import count
 
-from case import ANY, ContextMock, Mock, call, mock, skip, patch
+import pytest
+from case import ANY, ContextMock, Mock, call, mock, patch, skip
 
-from kombu import Connection, Exchange, Queue, Consumer, Producer
+from kombu import Connection, Consumer, Exchange, Producer, Queue
 from kombu.exceptions import InconsistencyError, VersionMismatch
-from kombu.five import Empty, Queue as _Queue, bytes_if_py2
+from kombu.five import Empty
+from kombu.five import Queue as _Queue
+from kombu.five import bytes_if_py2
+# must import after poller patch, pep8 complains
+from kombu.transport import redis  # noqa
 from kombu.transport import virtual
 from kombu.utils import eventio  # patch poll
 from kombu.utils.json import dumps
@@ -32,8 +35,6 @@ class _poll(eventio._select):
 
 
 eventio.poll = _poll
-# must import after poller patch, pep8 complains
-from kombu.transport import redis  # noqa
 
 
 class ResponseError(Exception):
diff --git a/t/unit/transport/test_zookeeper.py b/t/unit/transport/test_zookeeper.py
index 7505a6d9..c80c26be 100644
--- a/t/unit/transport/test_zookeeper.py
+++ b/t/unit/transport/test_zookeeper.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import pytest
 from case import skip
+
 from kombu import Connection
 from kombu.transport import zookeeper
 
diff --git a/t/unit/transport/virtual/test_base.py b/t/unit/transport/virtual/test_base.py
index 65cfa1ec..a9792853 100644
--- a/t/unit/transport/virtual/test_base.py
+++ b/t/unit/transport/virtual/test_base.py
@@ -1,18 +1,18 @@
 from __future__ import absolute_import, unicode_literals
 
 import io
-import pytest
-import warnings
 import socket
+import warnings
 
+import pytest
 from case import MagicMock, Mock, patch
 
 from kombu import Connection
 from kombu.compression import compress
-from kombu.exceptions import ResourceError, ChannelError
+from kombu.exceptions import ChannelError, ResourceError
+from kombu.five import PY3, monotonic
 from kombu.transport import virtual
 from kombu.utils.uuid import uuid
-from kombu.five import PY3, monotonic
 
 PRINT_FQDN = 'builtins.print' if PY3 else '__builtin__.print'
 
diff --git a/t/unit/transport/virtual/test_exchange.py b/t/unit/transport/virtual/test_exchange.py
index 7b94e56c..a61443c7 100644
--- a/t/unit/transport/virtual/test_exchange.py
+++ b/t/unit/transport/virtual/test_exchange.py
@@ -1,12 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu import Connection
 from kombu.transport.virtual import exchange
-
 from t.mocks import Transport
 
 
diff --git a/t/unit/utils/test_amq_manager.py b/t/unit/utils/test_amq_manager.py
index 3ea1e41a..4095499c 100644
--- a/t/unit/utils/test_amq_manager.py
+++ b/t/unit/utils/test_amq_manager.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import mock, patch
 
 from kombu import Connection
diff --git a/t/unit/utils/test_div.py b/t/unit/utils/test_div.py
index f0b1a058..452d6b2c 100644
--- a/t/unit/utils/test_div.py
+++ b/t/unit/utils/test_div.py
@@ -1,8 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-
-from io import StringIO, BytesIO
+from io import BytesIO, StringIO
 
 from kombu.utils.div import emergency_dump_state
 
diff --git a/t/unit/utils/test_encoding.py b/t/unit/utils/test_encoding.py
index 44c81a73..f1861664 100644
--- a/t/unit/utils/test_encoding.py
+++ b/t/unit/utils/test_encoding.py
@@ -2,16 +2,13 @@
 from __future__ import absolute_import, unicode_literals
 
 import sys
-
 from contextlib import contextmanager
 
 from case import patch, skip
 
-from kombu.five import bytes_t, string_t, string
-from kombu.utils.encoding import (
-    get_default_encoding_file, safe_str,
-    set_default_encoding_file, default_encoding,
-)
+from kombu.five import bytes_t, string, string_t
+from kombu.utils.encoding import (default_encoding, get_default_encoding_file,
+                                  safe_str, set_default_encoding_file)
 
 
 @contextmanager
@@ -67,6 +64,7 @@ def test_default_encode():
 
 class newbytes(bytes):
     """Mock class to simulate python-future newbytes class"""
+
     def __repr__(self):
         return 'b' + super(newbytes, self).__repr__()
 
diff --git a/t/unit/utils/test_functional.py b/t/unit/utils/test_functional.py
index 7a97b5b3..2a8ef353 100644
--- a/t/unit/utils/test_functional.py
+++ b/t/unit/utils/test_functional.py
@@ -1,18 +1,17 @@
 from __future__ import absolute_import, unicode_literals
 
 import pickle
-import pytest
-
 from itertools import count
 
+import pytest
 from case import Mock, mock, skip
 
 from kombu.five import items
 from kombu.utils import functional as utils
-from kombu.utils.functional import (
-    ChannelPromise, LRUCache, fxrange, fxrangemax, memoize, lazy,
-    maybe_evaluate, maybe_list, reprcall, reprkwargs, retry_over_time,
-)
+from kombu.utils.functional import (ChannelPromise, LRUCache, fxrange,
+                                    fxrangemax, lazy, maybe_evaluate,
+                                    maybe_list, memoize, reprcall, reprkwargs,
+                                    retry_over_time)
 
 
 class test_ChannelPromise:
diff --git a/t/unit/utils/test_imports.py b/t/unit/utils/test_imports.py
index 20b9a2f8..6013320a 100644
--- a/t/unit/utils/test_imports.py
+++ b/t/unit/utils/test_imports.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu import Exchange
diff --git a/t/unit/utils/test_json.py b/t/unit/utils/test_json.py
index ae7b374d..8654b0fa 100644
--- a/t/unit/utils/test_json.py
+++ b/t/unit/utils/test_json.py
@@ -1,12 +1,11 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
-import pytz
-
 from datetime import datetime
 from decimal import Decimal
 from uuid import uuid4
 
+import pytest
+import pytz
 from case import MagicMock, Mock, skip
 
 from kombu.five import text_t
diff --git a/t/unit/utils/test_scheduling.py b/t/unit/utils/test_scheduling.py
index 79216b56..c4f0134b 100644
--- a/t/unit/utils/test_scheduling.py
+++ b/t/unit/utils/test_scheduling.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import pytest
-
 from case import Mock
 
 from kombu.utils.scheduling import FairCycle, cycle_by_name
diff --git a/t/unit/utils/test_url.py b/t/unit/utils/test_url.py
index 3d2b0ede..50593c4b 100644
--- a/t/unit/utils/test_url.py
+++ b/t/unit/utils/test_url.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import pytest
 
-from kombu.utils.url import as_url, parse_url, maybe_sanitize_url
+from kombu.utils.url import as_url, maybe_sanitize_url, parse_url
 
 
 def test_parse_url():
diff --git a/tox.ini b/tox.ini
index a9babc1c..e49520ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ envlist =
     flakeplus
     apicheck
     pydocstyle
+    isort
 
 [testenv]
 sitepackages = False
@@ -23,12 +24,14 @@ deps=
 
     apicheck,linkcheck: -r{toxinidir}/requirements/docs.txt
     flake8,flakeplus,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
+    isort: isort>=4.3.4
 
 commands = pip install -U -r{toxinidir}/requirements/dev.txt
            pytest -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
 
 basepython =
-    2.7,flakeplus,flake8,apicheck,linkcheck,cov,pydocstyle: python2.7
+    2.7,flakeplus: python2.7
+    flake8,apicheck,linkcheck,cov,pydocstyle,isort: python3.6
     3.4: python3.4
     3.5: python3.5
     3.6: python3.6
@@ -38,15 +41,15 @@ basepython =
 
 [testenv:apicheck]
 commands = pip install -U -r{toxinidir}/requirements/dev.txt
-    sphinx-build -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
+    sphinx-build -j2 -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
 
 [testenv:linkcheck]
 commands = pip install -U -r{toxinidir}/requirements/dev.txt
-    sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
+    sphinx-build -j2 -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
 
 [testenv:flake8]
 commands =
-    flake8 {toxinidir}/kombu {toxinidir}/t
+    flake8 -j2 {toxinidir}/kombu {toxinidir}/t
 
 [testenv:flakeplus]
 commands =
@@ -55,3 +58,6 @@ commands =
 [testenv:pydocstyle]
 commands =
     pydocstyle {toxinidir}/kombu
+
+[testenv:isort]
+commands = isort -j2 --project kombu --diff --order-by-type -rc -c {toxinidir}/kombu {toxinidir}/t