summaryrefslogtreecommitdiff
path: root/t/unit
diff options
context:
space:
mode:
Diffstat (limited to 't/unit')
-rw-r--r--t/unit/asynchronous/aws/case.py1
-rw-r--r--t/unit/asynchronous/aws/sqs/test_connection.py7
-rw-r--r--t/unit/asynchronous/aws/sqs/test_queue.py2
-rw-r--r--t/unit/asynchronous/aws/test_connection.py18
-rw-r--r--t/unit/asynchronous/http/test_curl.py1
-rw-r--r--t/unit/asynchronous/http/test_http.py7
-rw-r--r--t/unit/asynchronous/test_hub.py12
-rw-r--r--t/unit/asynchronous/test_timer.py3
-rw-r--r--t/unit/conftest.py3
-rw-r--r--t/unit/test_clocks.py1
-rw-r--r--t/unit/test_common.py12
-rw-r--r--t/unit/test_compat.py7
-rw-r--r--t/unit/test_connection.py4
-rw-r--r--t/unit/test_entity.py3
-rw-r--r--t/unit/test_log.py10
-rw-r--r--t/unit/test_message.py2
-rw-r--r--t/unit/test_messaging.py6
-rw-r--r--t/unit/test_mixins.py2
-rw-r--r--t/unit/test_pidbox.py5
-rw-r--r--t/unit/test_pools.py4
-rw-r--r--t/unit/test_serialization.py20
-rw-r--r--t/unit/test_simple.py1
-rw-r--r--t/unit/transport/test_SQS.py6
-rw-r--r--t/unit/transport/test_base.py6
-rw-r--r--t/unit/transport/test_consul.py1
-rw-r--r--t/unit/transport/test_etcd.py2
-rw-r--r--t/unit/transport/test_filesystem.py2
-rw-r--r--t/unit/transport/test_librabbitmq.py1
-rw-r--r--t/unit/transport/test_memory.py5
-rw-r--r--t/unit/transport/test_mongodb.py2
-rw-r--r--t/unit/transport/test_pyamqp.py1
-rw-r--r--t/unit/transport/test_qpid.py8
-rw-r--r--t/unit/transport/test_redis.py15
-rw-r--r--t/unit/transport/test_zookeeper.py1
-rw-r--r--t/unit/transport/virtual/test_base.py8
-rw-r--r--t/unit/transport/virtual/test_exchange.py2
-rw-r--r--t/unit/utils/test_amq_manager.py1
-rw-r--r--t/unit/utils/test_div.py3
-rw-r--r--t/unit/utils/test_encoding.py10
-rw-r--r--t/unit/utils/test_functional.py11
-rw-r--r--t/unit/utils/test_imports.py1
-rw-r--r--t/unit/utils/test_json.py5
-rw-r--r--t/unit/utils/test_scheduling.py1
-rw-r--r--t/unit/utils/test_url.py2
44 files changed, 83 insertions, 142 deletions
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():