diff options
author | Omer Katz <omer.drow@gmail.com> | 2020-11-08 18:42:57 +0200 |
---|---|---|
committer | Omer Katz <omer.drow@gmail.com> | 2020-11-08 18:42:57 +0200 |
commit | 84ba9fadf3364a21f3e603b4dc5afdf18c1afb91 (patch) | |
tree | ef7a7316fe59de6dcccab295259649910bce102c | |
parent | aec7daab8dacc4a6c2b265fea9a4d15648432e69 (diff) | |
download | py-amqp-84ba9fadf3364a21f3e603b4dc5afdf18c1afb91.tar.gz |
autopep8 + isort
-rw-r--r-- | amqp/abstract_channel.pxd | 4 | ||||
-rw-r--r-- | amqp/basic_message.pxd | 1 | ||||
-rw-r--r-- | amqp/method_framing.pxd | 1 | ||||
-rw-r--r-- | amqp/platform.py | 1 | ||||
-rw-r--r-- | amqp/serialization.pxd | 3 | ||||
-rw-r--r-- | t/unit/test_method_framing.py | 2 | ||||
-rw-r--r-- | t/unit/test_transport.py | 62 |
7 files changed, 39 insertions, 35 deletions
diff --git a/amqp/abstract_channel.pxd b/amqp/abstract_channel.pxd index cfcaa62..ab1d5fb 100644 --- a/amqp/abstract_channel.pxd +++ b/amqp/abstract_channel.pxd @@ -1,6 +1,8 @@ # cython: language_level=3 import cython -from .serialization cimport loads, dumps + +from .serialization cimport dumps, loads + cdef object AMQP_LOGGER cdef object IGNORED_METHOD_DURING_CHANNEL_CLOSE diff --git a/amqp/basic_message.pxd b/amqp/basic_message.pxd index 58bb4aa..7ce307a 100644 --- a/amqp/basic_message.pxd +++ b/amqp/basic_message.pxd @@ -1,6 +1,7 @@ # cython: language_level=3 from .serialization cimport GenericContent + cdef class Message(GenericContent): cdef public object channel cdef public object delivery_info diff --git a/amqp/method_framing.pxd b/amqp/method_framing.pxd index 4264471..c5e2596 100644 --- a/amqp/method_framing.pxd +++ b/amqp/method_framing.pxd @@ -1,6 +1,7 @@ # cython: language_level=3 from .basic_message cimport Message + cdef object FRAME_OVERHEAD cdef object _CONTENT_METHODS diff --git a/amqp/platform.py b/amqp/platform.py index 67462be..69bc429 100644 --- a/amqp/platform.py +++ b/amqp/platform.py @@ -3,7 +3,6 @@ import platform import re import sys - # Jython does not have this attribute import typing diff --git a/amqp/serialization.pxd b/amqp/serialization.pxd index c7a06dd..24ee1d2 100644 --- a/amqp/serialization.pxd +++ b/amqp/serialization.pxd @@ -1,8 +1,9 @@ # cython: language_level=3 import cython -from amqp.utils cimport str_to_bytes from amqp.utils cimport bytes_to_str as pstr_t +from amqp.utils cimport str_to_bytes + cdef int _flushbits(list bits, write) diff --git a/t/unit/test_method_framing.py b/t/unit/test_method_framing.py index 1ece372..bd9c465 100644 --- a/t/unit/test_method_framing.py +++ b/t/unit/test_method_framing.py @@ -1,5 +1,5 @@ -from unittest.mock import Mock from struct import pack +from unittest.mock import Mock import pytest diff --git a/t/unit/test_transport.py b/t/unit/test_transport.py index 5eec1ab..a45c197 100644 --- a/t/unit/test_transport.py +++ b/t/unit/test_transport.py @@ -470,13 +470,13 @@ class test_AbstractTransport_connect: def test_connect_socket_initialization_fails(self): with patch('socket.socket', side_effect=socket.error), \ - patch('socket.getaddrinfo', - return_value=[ - (socket.AF_INET, 1, socket.IPPROTO_TCP, - '', ('127.0.0.1', 5672)), - (socket.AF_INET, 1, socket.IPPROTO_TCP, - '', ('127.0.0.2', 5672)) - ]): + patch('socket.getaddrinfo', + return_value=[ + (socket.AF_INET, 1, socket.IPPROTO_TCP, + '', ('127.0.0.1', 5672)), + (socket.AF_INET, 1, socket.IPPROTO_TCP, + '', ('127.0.0.2', 5672)) + ]): with pytest.raises(socket.error): self.t.connect() assert self.t.sock is None and self.t.connected is False @@ -514,13 +514,13 @@ class test_AbstractTransport_connect: def test_connect_short_curcuit_on_INET_succeed(self): with patch('socket.socket', return_value=MockSocket()), \ - patch('socket.getaddrinfo', - side_effect=[ - [(socket.AF_INET, 1, socket.IPPROTO_TCP, - '', ('127.0.0.1', 5672))], - [(socket.AF_INET6, 1, socket.IPPROTO_TCP, - '', ('::1', 5672))] - ]) as getaddrinfo: + patch('socket.getaddrinfo', + side_effect=[ + [(socket.AF_INET, 1, socket.IPPROTO_TCP, + '', ('127.0.0.1', 5672))], + [(socket.AF_INET6, 1, socket.IPPROTO_TCP, + '', ('::1', 5672))] + ]) as getaddrinfo: self.t.sock = Mock() self.t.close() self.t.connect() @@ -552,19 +552,19 @@ class test_AbstractTransport_connect: def test_connect_getaddrinfo_raises_gaierror_once_recovers(self): with patch('socket.socket', return_value=MockSocket()), \ - patch('socket.getaddrinfo', - side_effect=[ - socket.gaierror, - [(socket.AF_INET6, 1, socket.IPPROTO_TCP, - '', ('::1', 5672))] - ]): + patch('socket.getaddrinfo', + side_effect=[ + socket.gaierror, + [(socket.AF_INET6, 1, socket.IPPROTO_TCP, + '', ('::1', 5672))] + ]): self.t.connect() def test_connect_survives_not_implemented_set_cloexec(self): with patch('socket.socket', return_value=MockSocket()), \ - patch('socket.getaddrinfo', - return_value=[(socket.AF_INET, 1, socket.IPPROTO_TCP, - '', ('127.0.0.1', 5672))]): + patch('socket.getaddrinfo', + return_value=[(socket.AF_INET, 1, socket.IPPROTO_TCP, + '', ('127.0.0.1', 5672))]): with patch('amqp.transport.set_cloexec', side_effect=NotImplementedError) as cloexec_mock: self.t.connect() @@ -657,9 +657,9 @@ class test_SSLTransport: # testing _wrap_socket_sni() with parameters certfile and keyfile sock = Mock() with patch( - 'ssl.SSLContext.wrap_socket', - return_value=sentinel.WRAPPED_SOCKET) as mock_ssl_wrap, \ - patch('ssl.SSLContext.load_cert_chain') as mock_load_cert_chain: + 'ssl.SSLContext.wrap_socket', + return_value=sentinel.WRAPPED_SOCKET) as mock_ssl_wrap, \ + patch('ssl.SSLContext.load_cert_chain') as mock_load_cert_chain: ret = self.t._wrap_socket_sni( sock, keyfile=sentinel.KEYFILE, certfile=sentinel.CERTFILE) @@ -697,9 +697,9 @@ class test_SSLTransport: # testing _wrap_socket_sni() with parameter ciphers sock = Mock() with patch( - 'ssl.SSLContext.wrap_socket', - return_value=sentinel.WRAPPED_SOCKET) as mock_ssl_wrap, \ - patch('ssl.SSLContext.set_ciphers') as mock_set_ciphers: + 'ssl.SSLContext.wrap_socket', + return_value=sentinel.WRAPPED_SOCKET) as mock_ssl_wrap, \ + patch('ssl.SSLContext.set_ciphers') as mock_set_ciphers: ret = self.t._wrap_socket_sni(sock, ciphers=sentinel.CIPHERS) mock_set_ciphers.assert_called_with(sentinel.CIPHERS) @@ -732,7 +732,7 @@ class test_SSLTransport: # testing _wrap_socket_sni() with setting SNI header sock = Mock() with patch('ssl.SSLContext') as mock_ssl_context_class, \ - patch('ssl.HAS_SNI', new=True): + patch('ssl.HAS_SNI', new=True): # SSL module supports SNI wrap_socket_method_mock = mock_ssl_context_class().wrap_socket wrap_socket_method_mock.return_value = sentinel.WRAPPED_SOCKET @@ -751,7 +751,7 @@ class test_SSLTransport: assert ret == sentinel.WRAPPED_SOCKET with patch('ssl.SSLContext') as mock_ssl_context_class, \ - patch('ssl.HAS_SNI', new=False): + patch('ssl.HAS_SNI', new=False): # SSL module does not support SNI wrap_socket_method_mock = mock_ssl_context_class().wrap_socket wrap_socket_method_mock.return_value = sentinel.WRAPPED_SOCKET |