diff options
author | Omer Katz <omer.drow@gmail.com> | 2019-03-02 13:03:30 +0200 |
---|---|---|
committer | Omer Katz <omer.drow@gmail.com> | 2019-03-02 13:03:30 +0200 |
commit | 09cf92a643ed075d048856a56a2e730482401558 (patch) | |
tree | 7345375591ad1e4d0a259eef70c406e6f7fb723f | |
parent | 68b880070dc92f0b139c089cff154a3522a7504a (diff) | |
download | py-amqp-09cf92a643ed075d048856a56a2e730482401558.tar.gz |
isort.
-rw-r--r-- | amqp/channel.py | 4 | ||||
-rw-r--r-- | t/integration/test_integration.py | 12 | ||||
-rw-r--r-- | t/integration/test_rmq.py | 3 | ||||
-rw-r--r-- | t/unit/test_abstract_channel.py | 2 | ||||
-rw-r--r-- | t/unit/test_basic_message.py | 3 | ||||
-rw-r--r-- | t/unit/test_channel.py | 11 | ||||
-rw-r--r-- | t/unit/test_connection.py | 2 | ||||
-rw-r--r-- | t/unit/test_exceptions.py | 2 | ||||
-rw-r--r-- | t/unit/test_method_framing.py | 2 | ||||
-rw-r--r-- | t/unit/test_sasl.py | 2 | ||||
-rw-r--r-- | t/unit/test_transport.py | 2 | ||||
-rw-r--r-- | t/unit/test_utils.py | 3 |
12 files changed, 25 insertions, 23 deletions
diff --git a/amqp/channel.py b/amqp/channel.py index 39d4cb9..d91ad33 100644 --- a/amqp/channel.py +++ b/amqp/channel.py @@ -11,9 +11,9 @@ from vine import ensure_promise from . import spec from .abstract_channel import AbstractChannel -from .exceptions import (ChannelError, ConsumerCancelled, +from .exceptions import (ChannelError, ConsumerCancelled, MessageNacked, RecoverableChannelError, RecoverableConnectionError, - error_for_code, MessageNacked) + error_for_code) from .five import Queue from .protocol import queue_declare_ok_t diff --git a/t/integration/test_integration.py b/t/integration/test_integration.py index 2a6228d..738e233 100644 --- a/t/integration/test_integration.py +++ b/t/integration/test_integration.py @@ -1,15 +1,17 @@ from __future__ import absolute_import, unicode_literals import socket + import pytest -from case import patch, call, Mock, ANY + import amqp -from amqp import spec, Connection, Channel, sasl, Message +from amqp import Channel, Connection, Message, sasl, spec +from amqp.exceptions import (AccessRefused, ConnectionError, InvalidCommand, + NotFound, PreconditionFailed, ResourceLocked) from amqp.platform import pack -from amqp.exceptions import ConnectionError, \ - InvalidCommand, AccessRefused, PreconditionFailed, NotFound, ResourceLocked -from amqp.serialization import dumps, loads from amqp.protocol import queue_declare_ok_t +from amqp.serialization import dumps, loads +from case import ANY, Mock, call, patch connection_testdata = ( (spec.Connection.Blocked, '_on_blocked'), diff --git a/t/integration/test_rmq.py b/t/integration/test_rmq.py index 5f8b7e8..ca41ee9 100644 --- a/t/integration/test_rmq.py +++ b/t/integration/test_rmq.py @@ -1,8 +1,9 @@ from __future__ import absolute_import, unicode_literals -from case import Mock, ANY import pytest + import amqp +from case import ANY, Mock @pytest.mark.env('rabbitmq') diff --git a/t/unit/test_abstract_channel.py b/t/unit/test_abstract_channel.py index 233d1f6..01acf08 100644 --- a/t/unit/test_abstract_channel.py +++ b/t/unit/test_abstract_channel.py @@ -1,12 +1,12 @@ from __future__ import absolute_import, unicode_literals import pytest -from case import Mock, patch from vine import promise from amqp.abstract_channel import AbstractChannel from amqp.exceptions import AMQPNotImplementedError, RecoverableConnectionError from amqp.serialization import dumps +from case import Mock, patch class test_AbstractChannel: diff --git a/t/unit/test_basic_message.py b/t/unit/test_basic_message.py index 87225e2..8fd9a2a 100644 --- a/t/unit/test_basic_message.py +++ b/t/unit/test_basic_message.py @@ -1,8 +1,7 @@ from __future__ import absolute_import, unicode_literals -from case import Mock - from amqp.basic_message import Message +from case import Mock class test_Message: diff --git a/t/unit/test_channel.py b/t/unit/test_channel.py index dac1b84..9cd9ed0 100644 --- a/t/unit/test_channel.py +++ b/t/unit/test_channel.py @@ -1,17 +1,18 @@ from __future__ import absolute_import, unicode_literals -import pytest import socket -from case import ContextMock, Mock, patch, ANY, MagicMock + +import pytest from vine import promise from amqp import spec from amqp.basic_message import Message +from amqp.channel import Channel +from amqp.exceptions import (ConsumerCancelled, MessageNacked, NotFound, + RecoverableConnectionError) from amqp.platform import pack from amqp.serialization import dumps -from amqp.channel import Channel -from amqp.exceptions import ConsumerCancelled, NotFound, MessageNacked, \ - RecoverableConnectionError +from case import ANY, ContextMock, MagicMock, Mock, patch class test_Channel: diff --git a/t/unit/test_connection.py b/t/unit/test_connection.py index 86656b0..6dc0f61 100644 --- a/t/unit/test_connection.py +++ b/t/unit/test_connection.py @@ -4,7 +4,6 @@ import socket import warnings import pytest -from case import ContextMock, Mock, call, patch from amqp import Connection, spec from amqp.connection import SSLError @@ -12,6 +11,7 @@ from amqp.exceptions import ConnectionError, NotFound, ResourceError from amqp.five import items from amqp.sasl import AMQPLAIN, EXTERNAL, GSSAPI, PLAIN, SASL from amqp.transport import TCPTransport +from case import ContextMock, Mock, call, patch class test_Connection: diff --git a/t/unit/test_exceptions.py b/t/unit/test_exceptions.py index e1978c7..c02eeef 100644 --- a/t/unit/test_exceptions.py +++ b/t/unit/test_exceptions.py @@ -1,10 +1,10 @@ from __future__ import absolute_import, unicode_literals -from case import Mock import pytest import amqp.exceptions from amqp.exceptions import AMQPError, error_for_code +from case import Mock AMQP_EXCEPTIONS = ( 'ConnectionError', 'ChannelError', diff --git a/t/unit/test_method_framing.py b/t/unit/test_method_framing.py index e3c5111..232ed8d 100644 --- a/t/unit/test_method_framing.py +++ b/t/unit/test_method_framing.py @@ -1,13 +1,13 @@ from __future__ import absolute_import, unicode_literals import pytest -from case import Mock from amqp import spec from amqp.basic_message import Message from amqp.exceptions import UnexpectedFrame from amqp.method_framing import frame_handler, frame_writer from amqp.platform import pack +from case import Mock class test_frame_handler: diff --git a/t/unit/test_sasl.py b/t/unit/test_sasl.py index 06c9dc1..af9ac8d 100644 --- a/t/unit/test_sasl.py +++ b/t/unit/test_sasl.py @@ -6,10 +6,10 @@ import sys from io import BytesIO import pytest -from case import Mock, call, patch from amqp import sasl from amqp.serialization import _write_table +from case import Mock, call, patch class test_SASL: diff --git a/t/unit/test_transport.py b/t/unit/test_transport.py index 763435d..8e868fa 100644 --- a/t/unit/test_transport.py +++ b/t/unit/test_transport.py @@ -5,12 +5,12 @@ import socket import struct import pytest -from case import ANY, Mock, MagicMock, call, patch from amqp import transport from amqp.exceptions import UnexpectedFrame from amqp.platform import pack from amqp.transport import _AbstractTransport +from case import ANY, MagicMock, Mock, call, patch SIGNED_INT_MAX = 0x7FFFFFFF diff --git a/t/unit/test_utils.py b/t/unit/test_utils.py index 5368817..eff90c7 100644 --- a/t/unit/test_utils.py +++ b/t/unit/test_utils.py @@ -1,10 +1,9 @@ from __future__ import absolute_import, unicode_literals -from case import Mock, patch - from amqp.five import text_t from amqp.utils import (NullHandler, bytes_to_str, coro, get_errno, get_logger, str_to_bytes) +from case import Mock, patch class test_get_errno: |