You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2019/02/25 18:40:19 UTC
[qpid-proton] 02/06: PROTON-1992: [Python] Sort imports
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit b7571f03787aac9946c8719032668a7f959da3ed
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Wed Dec 12 12:32:08 2018 -0500
PROTON-1992: [Python] Sort imports
---
python/proton/_data.py | 39 +++++++++++-------------
python/proton/_delivery.py | 18 +++++------
python/proton/_endpoints.py | 74 +++++++++++++++++++++------------------------
python/proton/_events.py | 26 +++++++---------
python/proton/_message.py | 34 +++++++++------------
python/proton/_transport.py | 49 ++++++++++++++----------------
6 files changed, 107 insertions(+), 133 deletions(-)
diff --git a/python/proton/_data.py b/python/proton/_data.py
index f4ad381..0bfd4ec 100644
--- a/python/proton/_data.py
+++ b/python/proton/_data.py
@@ -21,30 +21,25 @@ from __future__ import absolute_import
import uuid
-from cproton import PN_TIMESTAMP, PN_FLOAT, PN_DESCRIBED, PN_DECIMAL64, PN_UBYTE, PN_UUID, PN_NULL, PN_BINARY, \
- PN_LIST, PN_OVERFLOW, PN_MAP, PN_LONG, PN_SHORT, PN_CHAR, PN_UINT, PN_ULONG, PN_STRING, PN_USHORT, PN_DOUBLE, \
- PN_BYTE, PN_DECIMAL32, PN_DECIMAL128, PN_ARRAY, PN_SYMBOL, PN_BOOL, PN_INT, \
- pn_data_get_binary, pn_data_get_decimal64, pn_data_put_symbol, pn_data_put_float, \
- pn_data_is_array_described, pn_data_exit, pn_data_put_uint, pn_data_put_decimal128, \
- pn_data_lookup, pn_data_put_char, pn_data_encoded_size, pn_data_get_bool, \
- pn_data_get_short, pn_data_prev, pn_data_type, pn_data_widen, pn_data_put_decimal64, \
- pn_data_put_string, pn_data_get_array, pn_data_put_ulong, pn_data_get_byte, pn_data_get_symbol, pn_data_encode, \
- pn_data_rewind, pn_data_put_bool, pn_data_is_null, pn_data_error, \
- pn_data_put_double, pn_data_copy, pn_data_put_int, pn_data_get_ubyte, pn_data_free, pn_data_clear, \
- pn_data_get_double, pn_data_put_byte, pn_data_put_uuid, pn_data_put_ushort, pn_data_is_described, \
- pn_data_get_float, pn_data_get_uint, pn_data_put_described, pn_data_get_decimal128, pn_data, \
- pn_data_get_array_type, pn_data_put_map, pn_data_put_list, pn_data_get_string, pn_data_get_char, \
- pn_data_put_decimal32, pn_data_enter, pn_data_put_short, pn_data_put_timestamp, \
- pn_data_get_long, pn_data_get_map, pn_data_narrow, pn_data_put_array, pn_data_get_ushort, \
- pn_data_get_int, pn_data_get_list, pn_data_get_ulong, pn_data_put_ubyte, \
- pn_data_format, pn_data_dump, pn_data_get_uuid, pn_data_get_decimal32, \
- pn_data_put_binary, pn_data_get_timestamp, pn_data_decode, pn_data_next, pn_data_put_null, pn_data_put_long, \
- pn_error_text
-
-from ._common import Constant
-from ._exceptions import EXCEPTIONS, DataException
+from cproton import PN_ARRAY, PN_BINARY, PN_BOOL, PN_BYTE, PN_CHAR, PN_DECIMAL128, PN_DECIMAL32, PN_DECIMAL64, \
+ PN_DESCRIBED, PN_DOUBLE, PN_FLOAT, PN_INT, PN_LIST, PN_LONG, PN_MAP, PN_NULL, PN_OVERFLOW, PN_SHORT, PN_STRING, \
+ PN_SYMBOL, PN_TIMESTAMP, PN_UBYTE, PN_UINT, PN_ULONG, PN_USHORT, PN_UUID, pn_data, pn_data_clear, pn_data_copy, \
+ pn_data_decode, pn_data_dump, pn_data_encode, pn_data_encoded_size, pn_data_enter, pn_data_error, pn_data_exit, \
+ pn_data_format, pn_data_free, pn_data_get_array, pn_data_get_array_type, pn_data_get_binary, pn_data_get_bool, \
+ pn_data_get_byte, pn_data_get_char, pn_data_get_decimal128, pn_data_get_decimal32, pn_data_get_decimal64, \
+ pn_data_get_double, pn_data_get_float, pn_data_get_int, pn_data_get_list, pn_data_get_long, pn_data_get_map, \
+ pn_data_get_short, pn_data_get_string, pn_data_get_symbol, pn_data_get_timestamp, pn_data_get_ubyte, \
+ pn_data_get_uint, pn_data_get_ulong, pn_data_get_ushort, pn_data_get_uuid, pn_data_is_array_described, \
+ pn_data_is_described, pn_data_is_null, pn_data_lookup, pn_data_narrow, pn_data_next, pn_data_prev, \
+ pn_data_put_array, pn_data_put_binary, pn_data_put_bool, pn_data_put_byte, pn_data_put_char, pn_data_put_decimal128, \
+ pn_data_put_decimal32, pn_data_put_decimal64, pn_data_put_described, pn_data_put_double, pn_data_put_float, \
+ pn_data_put_int, pn_data_put_list, pn_data_put_long, pn_data_put_map, pn_data_put_null, pn_data_put_short, \
+ pn_data_put_string, pn_data_put_symbol, pn_data_put_timestamp, pn_data_put_ubyte, pn_data_put_uint, \
+ pn_data_put_ulong, pn_data_put_ushort, pn_data_put_uuid, pn_data_rewind, pn_data_type, pn_data_widen, pn_error_text
from . import _compat
+from ._common import Constant
+from ._exceptions import DataException, EXCEPTIONS
#
# Hacks to provide Python2 <---> Python3 compatibility
diff --git a/python/proton/_delivery.py b/python/proton/_delivery.py
index e609451..665a77b 100644
--- a/python/proton/_delivery.py
+++ b/python/proton/_delivery.py
@@ -19,16 +19,14 @@
from __future__ import absolute_import
-from cproton import PN_REJECTED, PN_RELEASED, PN_MODIFIED, PN_RECEIVED, PN_ACCEPTED, \
- pn_disposition_is_undeliverable, pn_disposition_set_section_number, pn_disposition_get_section_number, \
- pn_disposition_set_undeliverable, pn_disposition_set_failed, pn_disposition_condition, \
- pn_disposition_set_section_offset, pn_disposition_data, pn_disposition_get_section_offset, \
- pn_disposition_is_failed, pn_disposition_annotations, \
- pn_delivery_partial, pn_delivery_aborted, pn_disposition_type, pn_delivery_pending, pn_delivery_updated, \
- pn_delivery_readable, pn_delivery_abort, pn_delivery_remote, pn_delivery_tag, pn_delivery_link, pn_delivery_local, \
- pn_delivery_update, pn_delivery_attachments, pn_delivery_local_state, pn_delivery_settled, pn_delivery_settle, \
- pn_delivery_writable, pn_delivery_remote_state, \
- pn_work_next
+from cproton import PN_ACCEPTED, PN_MODIFIED, PN_RECEIVED, PN_REJECTED, PN_RELEASED, pn_delivery_abort, \
+ pn_delivery_aborted, pn_delivery_attachments, pn_delivery_link, pn_delivery_local, pn_delivery_local_state, \
+ pn_delivery_partial, pn_delivery_pending, pn_delivery_readable, pn_delivery_remote, pn_delivery_remote_state, \
+ pn_delivery_settle, pn_delivery_settled, pn_delivery_tag, pn_delivery_update, pn_delivery_updated, \
+ pn_delivery_writable, pn_disposition_annotations, pn_disposition_condition, pn_disposition_data, \
+ pn_disposition_get_section_number, pn_disposition_get_section_offset, pn_disposition_is_failed, \
+ pn_disposition_is_undeliverable, pn_disposition_set_failed, pn_disposition_set_section_number, \
+ pn_disposition_set_section_offset, pn_disposition_set_undeliverable, pn_disposition_type, pn_work_next
from ._condition import cond2obj, obj2cond
from ._data import dat2obj, obj2dat
diff --git a/python/proton/_endpoints.py b/python/proton/_endpoints.py
index e873710..a497b67 100644
--- a/python/proton/_endpoints.py
+++ b/python/proton/_endpoints.py
@@ -25,47 +25,41 @@ from __future__ import absolute_import
import weakref
-from cproton import PN_LOCAL_UNINIT, PN_REMOTE_UNINIT, PN_LOCAL_ACTIVE, PN_REMOTE_ACTIVE, PN_LOCAL_CLOSED, \
- PN_REMOTE_CLOSED, \
- pn_connection, pn_connection_attachments, pn_connection_transport, pn_connection_error, pn_connection_condition, \
- pn_connection_remote_condition, pn_connection_collect, pn_connection_set_container, pn_connection_get_container, \
- pn_connection_get_hostname, pn_connection_set_hostname, pn_connection_get_user, pn_connection_set_user, \
- pn_connection_set_password, pn_connection_remote_container, pn_connection_remote_hostname, \
- pn_connection_remote_offered_capabilities, pn_connection_remote_desired_capabilities, \
- pn_connection_remote_properties, pn_connection_offered_capabilities, pn_connection_desired_capabilities, \
- pn_connection_properties, pn_connection_open, pn_connection_close, pn_connection_state, pn_connection_release, \
- pn_session, pn_session_head, pn_session_attachments, pn_session_condition, pn_session_remote_condition, \
- pn_session_get_incoming_capacity, pn_session_set_incoming_capacity, pn_session_get_outgoing_window, \
- pn_session_set_outgoing_window, pn_session_incoming_bytes, pn_session_outgoing_bytes, pn_session_open, \
- pn_session_close, pn_session_next, pn_session_state, pn_session_connection, pn_session_free, \
- PN_SND_UNSETTLED, PN_SND_SETTLED, PN_SND_MIXED, PN_RCV_FIRST, PN_RCV_SECOND, \
- pn_link_head, pn_link_is_sender, pn_link_attachments, pn_link_error, pn_link_condition, pn_link_remote_condition, \
- pn_link_open, pn_link_close, pn_link_state, pn_link_source, pn_link_target, pn_link_remote_source, \
- pn_link_remote_target, pn_link_session, pn_link_current, pn_link_advance, pn_link_unsettled, pn_link_credit, \
- pn_link_available, pn_link_queued, pn_link_next, pn_link_name, pn_link_is_receiver, pn_link_remote_snd_settle_mode, \
- pn_link_remote_rcv_settle_mode, pn_link_snd_settle_mode, pn_link_set_snd_settle_mode, pn_link_rcv_settle_mode, \
- pn_link_set_rcv_settle_mode, pn_link_get_drain, pn_link_set_drain, pn_link_drained, pn_link_remote_max_message_size, \
- pn_link_max_message_size, pn_link_set_max_message_size, pn_link_detach, pn_link_free, pn_link_offered, pn_link_send, \
- pn_link_flow, pn_link_recv, pn_link_drain, pn_link_draining, \
- pn_sender, pn_receiver, \
- PN_UNSPECIFIED, PN_SOURCE, PN_TARGET, PN_COORDINATOR, PN_NONDURABLE, PN_CONFIGURATION, \
- PN_DELIVERIES, PN_DIST_MODE_UNSPECIFIED, PN_DIST_MODE_COPY, PN_DIST_MODE_MOVE, PN_EXPIRE_WITH_LINK, \
- PN_EXPIRE_WITH_SESSION, PN_EXPIRE_WITH_CONNECTION, PN_EXPIRE_NEVER, \
- pn_terminus_set_durability, pn_terminus_set_timeout, pn_terminus_set_dynamic, pn_terminus_get_type, \
- pn_terminus_get_durability, pn_terminus_set_type, pn_terminus_get_address, pn_terminus_capabilities, \
- pn_terminus_set_address, pn_terminus_get_timeout, pn_terminus_filter, pn_terminus_properties, \
- pn_terminus_get_expiry_policy, pn_terminus_set_expiry_policy, pn_terminus_set_distribution_mode, \
- pn_terminus_get_distribution_mode, pn_terminus_copy, pn_terminus_outcomes, pn_terminus_is_dynamic, \
- PN_EOS, \
- pn_delivery, \
- pn_work_head, \
- pn_error_code, pn_error_text
-
-from ._common import utf82unicode, unicode2utf8
-from ._condition import obj2cond, cond2obj
-from ._data import Data, obj2dat, dat2obj
+from cproton import PN_CONFIGURATION, PN_COORDINATOR, PN_DELIVERIES, PN_DIST_MODE_COPY, PN_DIST_MODE_MOVE, \
+ PN_DIST_MODE_UNSPECIFIED, PN_EOS, PN_EXPIRE_NEVER, PN_EXPIRE_WITH_CONNECTION, PN_EXPIRE_WITH_LINK, \
+ PN_EXPIRE_WITH_SESSION, PN_LOCAL_ACTIVE, PN_LOCAL_CLOSED, PN_LOCAL_UNINIT, PN_NONDURABLE, PN_RCV_FIRST, \
+ PN_RCV_SECOND, PN_REMOTE_ACTIVE, PN_REMOTE_CLOSED, PN_REMOTE_UNINIT, PN_SND_MIXED, PN_SND_SETTLED, PN_SND_UNSETTLED, \
+ PN_SOURCE, PN_TARGET, PN_UNSPECIFIED, pn_connection, pn_connection_attachments, pn_connection_close, \
+ pn_connection_collect, pn_connection_condition, pn_connection_desired_capabilities, pn_connection_error, \
+ pn_connection_get_container, pn_connection_get_hostname, pn_connection_get_user, pn_connection_offered_capabilities, \
+ pn_connection_open, pn_connection_properties, pn_connection_release, pn_connection_remote_condition, \
+ pn_connection_remote_container, pn_connection_remote_desired_capabilities, pn_connection_remote_hostname, \
+ pn_connection_remote_offered_capabilities, pn_connection_remote_properties, pn_connection_set_container, \
+ pn_connection_set_hostname, pn_connection_set_password, pn_connection_set_user, pn_connection_state, \
+ pn_connection_transport, pn_delivery, pn_error_code, pn_error_text, pn_link_advance, pn_link_attachments, \
+ pn_link_available, pn_link_close, pn_link_condition, pn_link_credit, pn_link_current, pn_link_detach, pn_link_drain, \
+ pn_link_drained, pn_link_draining, pn_link_error, pn_link_flow, pn_link_free, pn_link_get_drain, pn_link_head, \
+ pn_link_is_receiver, pn_link_is_sender, pn_link_max_message_size, pn_link_name, pn_link_next, pn_link_offered, \
+ pn_link_open, pn_link_queued, pn_link_rcv_settle_mode, pn_link_recv, pn_link_remote_condition, \
+ pn_link_remote_max_message_size, pn_link_remote_rcv_settle_mode, pn_link_remote_snd_settle_mode, \
+ pn_link_remote_source, pn_link_remote_target, pn_link_send, pn_link_session, pn_link_set_drain, \
+ pn_link_set_max_message_size, pn_link_set_rcv_settle_mode, pn_link_set_snd_settle_mode, pn_link_snd_settle_mode, \
+ pn_link_source, pn_link_state, pn_link_target, pn_link_unsettled, pn_receiver, pn_sender, pn_session, \
+ pn_session_attachments, pn_session_close, pn_session_condition, pn_session_connection, pn_session_free, \
+ pn_session_get_incoming_capacity, pn_session_get_outgoing_window, pn_session_head, pn_session_incoming_bytes, \
+ pn_session_next, pn_session_open, pn_session_outgoing_bytes, pn_session_remote_condition, \
+ pn_session_set_incoming_capacity, pn_session_set_outgoing_window, pn_session_state, pn_terminus_capabilities, \
+ pn_terminus_copy, pn_terminus_filter, pn_terminus_get_address, pn_terminus_get_distribution_mode, \
+ pn_terminus_get_durability, pn_terminus_get_expiry_policy, pn_terminus_get_timeout, pn_terminus_get_type, \
+ pn_terminus_is_dynamic, pn_terminus_outcomes, pn_terminus_properties, pn_terminus_set_address, \
+ pn_terminus_set_distribution_mode, pn_terminus_set_durability, pn_terminus_set_dynamic, \
+ pn_terminus_set_expiry_policy, pn_terminus_set_timeout, pn_terminus_set_type, pn_work_head
+
+from ._common import unicode2utf8, utf82unicode
+from ._condition import cond2obj, obj2cond
+from ._data import Data, dat2obj, obj2dat
from ._delivery import Delivery
-from ._exceptions import EXCEPTIONS, LinkException, SessionException, ConnectionException
+from ._exceptions import ConnectionException, EXCEPTIONS, LinkException, SessionException
from ._transport import Transport
from ._wrapper import Wrapper
diff --git a/python/proton/_events.py b/python/proton/_events.py
index d322b2e..e761312 100644
--- a/python/proton/_events.py
+++ b/python/proton/_events.py
@@ -21,23 +21,19 @@ from __future__ import absolute_import
import threading
-from cproton import PN_SESSION_REMOTE_CLOSE, PN_SESSION_FINAL, pn_event_context, pn_collector_put, \
- pn_collector, PN_CONNECTION_REMOTE_OPEN, pn_event_type, \
- pn_collector_free, pn_collector_release, PN_SESSION_REMOTE_OPEN, \
- pn_collector_peek, pn_collector_more, PN_CONNECTION_BOUND, PN_LINK_FLOW, pn_event_connection, PN_LINK_LOCAL_CLOSE, \
- PN_TRANSPORT_ERROR, PN_CONNECTION_LOCAL_OPEN, PN_CONNECTION_LOCAL_CLOSE, pn_event_delivery, \
- PN_LINK_REMOTE_OPEN, PN_TRANSPORT_CLOSED, PN_TRANSPORT_HEAD_CLOSED, PN_TRANSPORT, \
- PN_CONNECTION_REMOTE_CLOSE, pn_collector_pop, PN_LINK_INIT, pn_event_link, PN_CONNECTION_UNBOUND, \
- pn_event_type_name, pn_event_session, PN_LINK_FINAL, pn_py2void, \
- PN_LINK_LOCAL_DETACH, PN_SESSION_INIT, PN_CONNECTION_FINAL, PN_TIMER_TASK, pn_class_name,\
- pn_event_transport, PN_TRANSPORT_TAIL_CLOSED,PN_SESSION_LOCAL_OPEN, PN_DELIVERY, \
- PN_SESSION_LOCAL_CLOSE, PN_LINK_LOCAL_OPEN, \
- PN_LINK_REMOTE_DETACH, PN_PYREF, PN_LINK_REMOTE_CLOSE, \
- PN_CONNECTION_INIT, pn_event_class, pn_void2py, pn_cast_pn_session, pn_cast_pn_link, pn_cast_pn_delivery, \
- pn_cast_pn_transport, pn_cast_pn_connection
+from cproton import PN_CONNECTION_BOUND, PN_CONNECTION_FINAL, PN_CONNECTION_INIT, PN_CONNECTION_LOCAL_CLOSE, \
+ PN_CONNECTION_LOCAL_OPEN, PN_CONNECTION_REMOTE_CLOSE, PN_CONNECTION_REMOTE_OPEN, PN_CONNECTION_UNBOUND, PN_DELIVERY, \
+ PN_LINK_FINAL, PN_LINK_FLOW, PN_LINK_INIT, PN_LINK_LOCAL_CLOSE, PN_LINK_LOCAL_DETACH, PN_LINK_LOCAL_OPEN, \
+ PN_LINK_REMOTE_CLOSE, PN_LINK_REMOTE_DETACH, PN_LINK_REMOTE_OPEN, PN_PYREF, PN_SESSION_FINAL, PN_SESSION_INIT, \
+ PN_SESSION_LOCAL_CLOSE, PN_SESSION_LOCAL_OPEN, PN_SESSION_REMOTE_CLOSE, PN_SESSION_REMOTE_OPEN, PN_TIMER_TASK, \
+ PN_TRANSPORT, PN_TRANSPORT_CLOSED, PN_TRANSPORT_ERROR, PN_TRANSPORT_HEAD_CLOSED, PN_TRANSPORT_TAIL_CLOSED, \
+ pn_cast_pn_connection, pn_cast_pn_delivery, pn_cast_pn_link, pn_cast_pn_session, pn_cast_pn_transport, \
+ pn_class_name, pn_collector, pn_collector_free, pn_collector_more, pn_collector_peek, pn_collector_pop, \
+ pn_collector_put, pn_collector_release, pn_event_class, pn_event_connection, pn_event_context, pn_event_delivery, \
+ pn_event_link, pn_event_session, pn_event_transport, pn_event_type, pn_event_type_name, pn_py2void, pn_void2py
from ._delivery import Delivery
-from ._endpoints import Connection, Session, Link
+from ._endpoints import Connection, Link, Session
from ._transport import Transport
diff --git a/python/proton/_message.py b/python/proton/_message.py
index 2f3709a..753ac4d 100644
--- a/python/proton/_message.py
+++ b/python/proton/_message.py
@@ -19,28 +19,22 @@
from __future__ import absolute_import
-from cproton import PN_DEFAULT_PRIORITY, PN_OVERFLOW, \
- pn_message_set_delivery_count, pn_message_set_address, pn_message_properties, \
- pn_message_get_user_id, pn_message_set_content_encoding, pn_message_get_subject, pn_message_get_priority, \
- pn_message_get_content_encoding, pn_message_body, \
- pn_message_correlation_id, pn_message_get_address, pn_message_set_content_type, pn_message_get_group_id, \
- pn_message_set_expiry_time, pn_message_set_creation_time, pn_message_error, \
- pn_message_is_first_acquirer, pn_message_set_priority, \
- pn_message_free, pn_message_get_creation_time, pn_message_is_inferred, pn_message_set_subject, \
- pn_message_set_user_id, pn_message_set_group_id, \
- pn_message_id, pn_message_clear, pn_message_set_durable, \
- pn_message_set_first_acquirer, pn_message_get_delivery_count, \
- pn_message_decode, pn_message_set_reply_to_group_id, \
- pn_message_get_group_sequence, pn_message_set_reply_to, \
- pn_message_set_ttl, pn_message_get_reply_to, pn_message, pn_message_annotations, pn_message_is_durable, \
- pn_message_instructions, pn_message_get_content_type, \
- pn_message_get_reply_to_group_id, pn_message_get_ttl, pn_message_encode, pn_message_get_expiry_time, \
- pn_message_set_group_sequence, pn_message_set_inferred, \
- pn_inspect, pn_string, pn_string_get, pn_free, pn_error_text
+from cproton import PN_DEFAULT_PRIORITY, PN_OVERFLOW, pn_error_text, pn_message, \
+ pn_message_annotations, pn_message_body, pn_message_clear, pn_message_correlation_id, pn_message_decode, \
+ pn_message_encode, pn_message_error, pn_message_free, pn_message_get_address, pn_message_get_content_encoding, \
+ pn_message_get_content_type, pn_message_get_creation_time, pn_message_get_delivery_count, \
+ pn_message_get_expiry_time, pn_message_get_group_id, pn_message_get_group_sequence, pn_message_get_priority, \
+ pn_message_get_reply_to, pn_message_get_reply_to_group_id, pn_message_get_subject, pn_message_get_ttl, \
+ pn_message_get_user_id, pn_message_id, pn_message_instructions, pn_message_is_durable, pn_message_is_first_acquirer, \
+ pn_message_is_inferred, pn_message_properties, pn_message_set_address, pn_message_set_content_encoding, \
+ pn_message_set_content_type, pn_message_set_creation_time, pn_message_set_delivery_count, pn_message_set_durable, \
+ pn_message_set_expiry_time, pn_message_set_first_acquirer, pn_message_set_group_id, pn_message_set_group_sequence, \
+ pn_message_set_inferred, pn_message_set_priority, pn_message_set_reply_to, pn_message_set_reply_to_group_id, \
+ pn_message_set_subject, pn_message_set_ttl, pn_message_set_user_id
from . import _compat
-from ._common import isinteger, secs2millis, millis2secs, unicode2utf8, utf82unicode
-from ._data import Data, ulong, symbol
+from ._common import isinteger, millis2secs, secs2millis, unicode2utf8, utf82unicode
+from ._data import Data, symbol, ulong
from ._endpoints import Link
from ._exceptions import EXCEPTIONS, MessageException
diff --git a/python/proton/_transport.py b/python/proton/_transport.py
index 182fde6..2c7a9b4 100644
--- a/python/proton/_transport.py
+++ b/python/proton/_transport.py
@@ -19,35 +19,32 @@
from __future__ import absolute_import
-from cproton import PN_SASL_AUTH, PN_SASL_PERM, PN_SASL_SYS, PN_SSL_RESUME_REUSED, PN_SASL_NONE, PN_SSL_SHA1, \
- PN_SSL_CERT_SUBJECT_COUNTRY_NAME, PN_SASL_OK, PN_SSL_RESUME_UNKNOWN, PN_EOS, PN_SSL_ANONYMOUS_PEER, PN_SSL_MD5, \
- PN_SSL_CERT_SUBJECT_COMMON_NAME, PN_SSL_VERIFY_PEER, PN_SSL_CERT_SUBJECT_CITY_OR_LOCALITY, PN_SSL_MODE_SERVER, \
- PN_TRACE_DRV, PN_TRACE_RAW, pn_transport, PN_SSL_SHA256, PN_TRACE_FRM, PN_SSL_MODE_CLIENT, PN_SASL_TEMP, \
- PN_SSL_SHA512, PN_SSL_CERT_SUBJECT_ORGANIZATION_UNIT, PN_OK, PN_SSL_CERT_SUBJECT_STATE_OR_PROVINCE, \
- PN_SSL_VERIFY_PEER_NAME, PN_SSL_CERT_SUBJECT_ORGANIZATION_NAME, PN_SSL_RESUME_NEW, PN_TRACE_OFF, \
- pn_transport_get_channel_max, pn_transport_capacity, pn_transport_push, pn_transport_get_user, pn_transport_tick, \
- pn_transport_set_max_frame, pn_transport_attachments, pn_transport_unbind, pn_transport_peek, \
- pn_transport_set_channel_max, pn_transport_close_tail, pn_transport_condition, pn_transport_is_encrypted, \
- pn_transport_get_frames_input, pn_transport_bind, pn_transport_closed, pn_transport_get_idle_timeout, \
- pn_transport_get_remote_idle_timeout, pn_transport_get_frames_output, pn_transport_pending, \
- pn_transport_set_pytracer, pn_transport_close_head, pn_transport_get_remote_max_frame, \
- pn_transport_is_authenticated, pn_transport_set_idle_timeout, pn_transport_log, pn_transport_get_pytracer, \
- pn_transport_require_auth, pn_transport_get_max_frame, pn_transport_set_server, pn_transport_remote_channel_max, \
- pn_transport_require_encryption, pn_transport_pop, pn_transport_connection, \
- pn_sasl, pn_sasl_set_allow_insecure_mechs, pn_sasl_outcome, pn_transport_error, pn_sasl_get_user, \
- pn_sasl_extended, pn_sasl_done, pn_sasl_get_allow_insecure_mechs, pn_sasl_allowed_mechs, \
- pn_sasl_config_name, pn_sasl_config_path, \
- pn_ssl, pn_ssl_init, pn_ssl_domain_allow_unsecured_client, pn_ssl_domain_free, \
- pn_ssl_domain, pn_transport_trace, pn_ssl_resume_status, pn_sasl_get_mech, \
- pn_ssl_domain_set_trusted_ca_db, pn_ssl_get_remote_subject_subfield, pn_ssl_present, \
- pn_ssl_get_remote_subject, pn_ssl_domain_set_credentials, pn_ssl_domain_set_peer_authentication, \
- pn_ssl_get_peer_hostname, pn_ssl_set_peer_hostname, pn_ssl_get_cipher_name, pn_ssl_get_cert_fingerprint, \
- pn_ssl_get_protocol_name, \
- pn_error_text
+from cproton import PN_EOS, PN_OK, PN_SASL_AUTH, PN_SASL_NONE, PN_SASL_OK, PN_SASL_PERM, PN_SASL_SYS, PN_SASL_TEMP, \
+ PN_SSL_ANONYMOUS_PEER, PN_SSL_CERT_SUBJECT_CITY_OR_LOCALITY, PN_SSL_CERT_SUBJECT_COMMON_NAME, \
+ PN_SSL_CERT_SUBJECT_COUNTRY_NAME, PN_SSL_CERT_SUBJECT_ORGANIZATION_NAME, PN_SSL_CERT_SUBJECT_ORGANIZATION_UNIT, \
+ PN_SSL_CERT_SUBJECT_STATE_OR_PROVINCE, PN_SSL_MD5, PN_SSL_MODE_CLIENT, PN_SSL_MODE_SERVER, PN_SSL_RESUME_NEW, \
+ PN_SSL_RESUME_REUSED, PN_SSL_RESUME_UNKNOWN, PN_SSL_SHA1, PN_SSL_SHA256, PN_SSL_SHA512, PN_SSL_VERIFY_PEER, \
+ PN_SSL_VERIFY_PEER_NAME, PN_TRACE_DRV, PN_TRACE_FRM, PN_TRACE_OFF, PN_TRACE_RAW, pn_error_text, pn_sasl, \
+ pn_sasl_allowed_mechs, pn_sasl_config_name, pn_sasl_config_path, pn_sasl_done, pn_sasl_extended, \
+ pn_sasl_get_allow_insecure_mechs, pn_sasl_get_mech, pn_sasl_get_user, pn_sasl_outcome, \
+ pn_sasl_set_allow_insecure_mechs, pn_ssl, pn_ssl_domain, pn_ssl_domain_allow_unsecured_client, pn_ssl_domain_free, \
+ pn_ssl_domain_set_credentials, pn_ssl_domain_set_peer_authentication, pn_ssl_domain_set_trusted_ca_db, \
+ pn_ssl_get_cert_fingerprint, pn_ssl_get_cipher_name, pn_ssl_get_peer_hostname, pn_ssl_get_protocol_name, \
+ pn_ssl_get_remote_subject, pn_ssl_get_remote_subject_subfield, pn_ssl_init, pn_ssl_present, pn_ssl_resume_status, \
+ pn_ssl_set_peer_hostname, pn_transport, pn_transport_attachments, pn_transport_bind, pn_transport_capacity, \
+ pn_transport_close_head, pn_transport_close_tail, pn_transport_closed, pn_transport_condition, \
+ pn_transport_connection, pn_transport_error, pn_transport_get_channel_max, pn_transport_get_frames_input, \
+ pn_transport_get_frames_output, pn_transport_get_idle_timeout, pn_transport_get_max_frame, \
+ pn_transport_get_pytracer, pn_transport_get_remote_idle_timeout, pn_transport_get_remote_max_frame, \
+ pn_transport_get_user, pn_transport_is_authenticated, pn_transport_is_encrypted, pn_transport_log, \
+ pn_transport_peek, pn_transport_pending, pn_transport_pop, pn_transport_push, pn_transport_remote_channel_max, \
+ pn_transport_require_auth, pn_transport_require_encryption, pn_transport_set_channel_max, \
+ pn_transport_set_idle_timeout, pn_transport_set_max_frame, pn_transport_set_pytracer, pn_transport_set_server, \
+ pn_transport_tick, pn_transport_trace, pn_transport_unbind
from ._common import millis2secs, secs2millis, unicode2utf8, utf82unicode
from ._condition import cond2obj
-from ._exceptions import EXCEPTIONS, TransportException, SessionException, SSLException, SSLUnavailable
+from ._exceptions import EXCEPTIONS, SSLException, SSLUnavailable, SessionException, TransportException
from ._wrapper import Wrapper
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org