diff options
35 files changed, 45 insertions, 45 deletions
diff --git a/kombu/abstract.py b/kombu/abstract.py index 39516970..5d6c1fe4 100644 --- a/kombu/abstract.py +++ b/kombu/abstract.py @@ -8,7 +8,7 @@ from .exceptions import NotBoundError from .five import python_2_unicode_compatible from .utils.functional import ChannelPromise -__all__ = ['Object', 'MaybeChannelBound'] +__all__ = ('Object', 'MaybeChannelBound') def unpickle_dict(cls, kwargs): diff --git a/kombu/asynchronous/__init__.py b/kombu/asynchronous/__init__.py index 3b0e3e07..8d078d07 100644 --- a/kombu/asynchronous/__init__.py +++ b/kombu/asynchronous/__init__.py @@ -6,4 +6,4 @@ from .hub import Hub, get_event_loop, set_event_loop from kombu.utils.eventio import READ, WRITE, ERR -__all__ = ['READ', 'WRITE', 'ERR', 'Hub', 'get_event_loop', 'set_event_loop'] +__all__ = ('READ', 'WRITE', 'ERR', 'Hub', 'get_event_loop', 'set_event_loop') diff --git a/kombu/asynchronous/aws/connection.py b/kombu/asynchronous/aws/connection.py index df257be3..e5f92baa 100644 --- a/kombu/asynchronous/aws/connection.py +++ b/kombu/asynchronous/aws/connection.py @@ -29,9 +29,9 @@ except ImportError: # pragma: no cover b'{0}: {1}'.format(*h) for h in hdr )) -__all__ = [ +__all__ = ( 'AsyncHTTPSConnection', 'AsyncConnection', -] +) @python_2_unicode_compatible diff --git a/kombu/asynchronous/aws/ext.py b/kombu/asynchronous/aws/ext.py index 3519ab65..8c962df9 100644 --- a/kombu/asynchronous/aws/ext.py +++ b/kombu/asynchronous/aws/ext.py @@ -21,6 +21,6 @@ except ImportError: get_response = _void() -__all__ = [ +__all__ = ( 'exceptions', 'AWSRequest', 'get_response' -] +) diff --git a/kombu/asynchronous/aws/sqs/connection.py b/kombu/asynchronous/aws/sqs/connection.py index e51f0923..ad8c3f13 100644 --- a/kombu/asynchronous/aws/sqs/connection.py +++ b/kombu/asynchronous/aws/sqs/connection.py @@ -11,7 +11,7 @@ from .message import AsyncMessage from .queue import AsyncQueue -__all__ = ['AsyncSQSConnection'] +__all__ = ('AsyncSQSConnection') class AsyncSQSConnection(AsyncAWSQueryConnection): diff --git a/kombu/asynchronous/http/__init__.py b/kombu/asynchronous/http/__init__.py index df0825c3..eb586474 100644 --- a/kombu/asynchronous/http/__init__.py +++ b/kombu/asynchronous/http/__init__.py @@ -4,7 +4,7 @@ from kombu.asynchronous import get_event_loop from .base import Request, Headers, Response -__all__ = ['Client', 'Headers', 'Response', 'Request'] +__all__ = ('Client', 'Headers', 'Response', 'Request') def Client(hub=None, **kwargs): diff --git a/kombu/asynchronous/http/base.py b/kombu/asynchronous/http/base.py index 29bd5bdc..c7e34531 100644 --- a/kombu/asynchronous/http/base.py +++ b/kombu/asynchronous/http/base.py @@ -16,7 +16,7 @@ try: # pragma: no cover except ImportError: from httplib import responses # noqa -__all__ = ['Headers', 'Response', 'Request'] +__all__ = ('Headers', 'Response', 'Request') PYPY = hasattr(sys, 'pypy_version_info') diff --git a/kombu/asynchronous/http/curl.py b/kombu/asynchronous/http/curl.py index 45a3ce76..7f43e864 100644 --- a/kombu/asynchronous/http/curl.py +++ b/kombu/asynchronous/http/curl.py @@ -27,7 +27,7 @@ else: 'HEAD': pycurl.NOBODY, } -__all__ = ['CurlClient'] +__all__ = ('CurlClient') DEFAULT_USER_AGENT = bytes_if_py2('Mozilla/5.0 (compatible; pycurl)') EXTRA_METHODS = frozenset(['DELETE', 'OPTIONS', 'PATCH']) diff --git a/kombu/asynchronous/hub.py b/kombu/asynchronous/hub.py index 7cc6e35f..262aa703 100644 --- a/kombu/asynchronous/hub.py +++ b/kombu/asynchronous/hub.py @@ -16,7 +16,7 @@ from vine import Thenable, promise from .timer import Timer -__all__ = ['Hub', 'get_event_loop', 'set_event_loop'] +__all__ = ('Hub', 'get_event_loop', 'set_event_loop') logger = get_logger(__name__) _current_loop = None diff --git a/kombu/asynchronous/semaphore.py b/kombu/asynchronous/semaphore.py index af40cc03..00b73436 100644 --- a/kombu/asynchronous/semaphore.py +++ b/kombu/asynchronous/semaphore.py @@ -6,7 +6,7 @@ from collections import deque from kombu.five import python_2_unicode_compatible -__all__ = ['DummyLock', 'LaxBoundedSemaphore'] +__all__ = ('DummyLock', 'LaxBoundedSemaphore') @python_2_unicode_compatible diff --git a/kombu/asynchronous/timer.py b/kombu/asynchronous/timer.py index 6d8cbd90..0bb3e981 100644 --- a/kombu/asynchronous/timer.py +++ b/kombu/asynchronous/timer.py @@ -21,7 +21,7 @@ try: except ImportError: # pragma: no cover utc = None -__all__ = ['Entry', 'Timer', 'to_timestamp'] +__all__ = ('Entry', 'Timer', 'to_timestamp') logger = get_logger(__name__) diff --git a/kombu/clocks.py b/kombu/clocks.py index cd458f62..0e086637 100644 --- a/kombu/clocks.py +++ b/kombu/clocks.py @@ -7,7 +7,7 @@ from operator import itemgetter from .five import python_2_unicode_compatible, zip -__all__ = ['LamportClock', 'timetuple'] +__all__ = ('LamportClock', 'timetuple') R_CLOCK = '_lamport(clock={0}, timestamp={1}, id={2} {3!r})' diff --git a/kombu/common.py b/kombu/common.py index 56d63127..6d214911 100644 --- a/kombu/common.py +++ b/kombu/common.py @@ -27,10 +27,10 @@ except ImportError: # pragma: no cover except ImportError: # pragma: no cover from dummy_thread import get_ident # noqa -__all__ = ['Broadcast', 'maybe_declare', 'uuid', +__all__ = ('Broadcast', 'maybe_declare', 'uuid', 'itermessages', 'send_reply', 'collect_replies', 'insured', 'drain_consumer', - 'eventloop'] + 'eventloop') #: Prefetch count can't exceed short. PREFETCH_COUNT_MAX = 0xFFFF diff --git a/kombu/compat.py b/kombu/compat.py index 5a53f781..f536220e 100644 --- a/kombu/compat.py +++ b/kombu/compat.py @@ -10,7 +10,7 @@ from . import messaging from .entity import Exchange, Queue from .five import items -__all__ = ['Publisher', 'Consumer'] +__all__ = ('Publisher', 'Consumer') # XXX compat attribute entry_to_queue = Queue.from_dict diff --git a/kombu/compression.py b/kombu/compression.py index 38ea493d..c0f55a9e 100644 --- a/kombu/compression.py +++ b/kombu/compression.py @@ -10,8 +10,8 @@ _aliases = {} _encoders = {} _decoders = {} -__all__ = ['register', 'encoders', 'get_encoder', - 'get_decoder', 'compress', 'decompress'] +__all__ = ('register', 'encoders', 'get_encoder', + 'get_decoder', 'compress', 'decompress') def register(encoder, decoder, content_type, aliases=[]): diff --git a/kombu/connection.py b/kombu/connection.py index 665cec60..27f404bd 100644 --- a/kombu/connection.py +++ b/kombu/connection.py @@ -33,7 +33,7 @@ from .utils.functional import dictfilter, lazy, retry_over_time, shufflecycle from .utils.objects import cached_property from .utils.url import as_url, parse_url, quote, urlparse -__all__ = ['Connection', 'ConnectionPool', 'ChannelPool'] +__all__ = ('Connection', 'ConnectionPool', 'ChannelPool') logger = get_logger(__name__) diff --git a/kombu/entity.py b/kombu/entity.py index ccdeda2e..3c272755 100644 --- a/kombu/entity.py +++ b/kombu/entity.py @@ -13,7 +13,7 @@ PERSISTENT_DELIVERY_MODE = 2 DELIVERY_MODES = {'transient': TRANSIENT_DELIVERY_MODE, 'persistent': PERSISTENT_DELIVERY_MODE} -__all__ = ['Exchange', 'Queue', 'binding', 'maybe_delivery_mode'] +__all__ = ('Exchange', 'Queue', 'binding', 'maybe_delivery_mode') INTERNAL_EXCHANGE_PREFIX = ('amq.',) diff --git a/kombu/exceptions.py b/kombu/exceptions.py index 139f1cfa..2bf802ec 100644 --- a/kombu/exceptions.py +++ b/kombu/exceptions.py @@ -7,7 +7,7 @@ from amqp import ChannelError, ConnectionError, ResourceError from kombu.five import python_2_unicode_compatible -__all__ = [ +__all__ = ( 'KombuError', 'OperationalError', 'NotBoundError', 'MessageStateError', 'TimeoutError', 'LimitExceeded', 'ConnectionLimitExceeded', @@ -15,7 +15,7 @@ __all__ = [ 'VersionMismatch', 'SerializerNotInstalled', 'ResourceError', 'SerializationError', 'EncodeError', 'DecodeError', 'HttpError', 'InconsistencyError', -] +) class KombuError(Exception): diff --git a/kombu/log.py b/kombu/log.py index 569cb09b..db0d5e66 100644 --- a/kombu/log.py +++ b/kombu/log.py @@ -13,7 +13,7 @@ from .utils.encoding import safe_repr, safe_str from .utils.functional import maybe_evaluate from .utils.objects import cached_property -__all__ = ['LogMixin', 'LOG_LEVELS', 'get_loglevel', 'setup_logging'] +__all__ = ('LogMixin', 'LOG_LEVELS', 'get_loglevel', 'setup_logging') try: LOG_LEVELS = dict(logging._nameToLevel) diff --git a/kombu/message.py b/kombu/message.py index 6b7c4a08..2dd36ea4 100644 --- a/kombu/message.py +++ b/kombu/message.py @@ -9,7 +9,7 @@ from .five import python_2_unicode_compatible, reraise, text_t from .serialization import loads from .utils.functional import dictfilter -__all__ = ['Message'] +__all__ = ('Message') ACK_STATES = {'ACK', 'REJECTED', 'REQUEUED'} IS_PYPY = hasattr(sys, 'pypy_version_info') diff --git a/kombu/messaging.py b/kombu/messaging.py index 4bb7f3de..1dc81e6e 100644 --- a/kombu/messaging.py +++ b/kombu/messaging.py @@ -12,7 +12,7 @@ from .five import items, python_2_unicode_compatible, text_t, values from .serialization import dumps, prepare_accept_content from .utils.functional import ChannelPromise, maybe_list -__all__ = ['Exchange', 'Queue', 'Producer', 'Consumer'] +__all__ = ('Exchange', 'Queue', 'Producer', 'Consumer') @python_2_unicode_compatible diff --git a/kombu/mixins.py b/kombu/mixins.py index 4acde4c7..825d272a 100644 --- a/kombu/mixins.py +++ b/kombu/mixins.py @@ -18,7 +18,7 @@ from .utils.encoding import safe_repr from .utils.limits import TokenBucket from .utils.objects import cached_property -__all__ = ['ConsumerMixin', 'ConsumerProducerMixin'] +__all__ = ('ConsumerMixin', 'ConsumerProducerMixin') logger = get_logger(__name__) debug, info, warn, error = logger.debug, logger.info, logger.warn, logger.error diff --git a/kombu/pidbox.py b/kombu/pidbox.py index 9231fedf..f8fcecb0 100644 --- a/kombu/pidbox.py +++ b/kombu/pidbox.py @@ -29,7 +29,7 @@ Or if you meant to start multiple nodes on the same host please make sure you give each node a unique node name! """ -__all__ = ['Node', 'Mailbox'] +__all__ = ('Node', 'Mailbox') logger = get_logger(__name__) debug, error = logger.debug, logger.error diff --git a/kombu/pools.py b/kombu/pools.py index 862780d9..1a25b1fa 100644 --- a/kombu/pools.py +++ b/kombu/pools.py @@ -12,8 +12,8 @@ from .utils.collections import EqualityDict from .utils.compat import register_after_fork from .utils.functional import lazy -__all__ = ['ProducerPool', 'PoolGroup', 'register_group', - 'connections', 'producers', 'get_limit', 'set_limit', 'reset'] +__all__ = ('ProducerPool', 'PoolGroup', 'register_group', + 'connections', 'producers', 'get_limit', 'set_limit', 'reset') _limit = [10] _groups = [] use_global_limit = object() diff --git a/kombu/serialization.py b/kombu/serialization.py index da01d7af..8a184395 100644 --- a/kombu/serialization.py +++ b/kombu/serialization.py @@ -22,7 +22,7 @@ from .five import reraise, text_t from .utils.compat import entrypoints from .utils.encoding import bytes_to_str, str_to_bytes, bytes_t -__all__ = ['pickle', 'loads', 'dumps', 'register', 'unregister'] +__all__ = ('pickle', 'loads', 'dumps', 'register', 'unregister') SKIP_DECODE = frozenset(['binary', 'ascii-8bit']) TRUSTED_CONTENT = frozenset(['application/data', 'application/text']) diff --git a/kombu/simple.py b/kombu/simple.py index 5177a38f..b8d079a0 100644 --- a/kombu/simple.py +++ b/kombu/simple.py @@ -10,7 +10,7 @@ from . import messaging from .connection import maybe_channel from .five import Empty, monotonic -__all__ = ['SimpleQueue', 'SimpleBuffer'] +__all__ = ('SimpleQueue', 'SimpleBuffer') class SimpleBase(object): diff --git a/kombu/transport/base.py b/kombu/transport/base.py index b8b3fd28..74cdae05 100644 --- a/kombu/transport/base.py +++ b/kombu/transport/base.py @@ -13,7 +13,7 @@ from kombu.utils.functional import dictfilter from kombu.utils.objects import cached_property from kombu.utils.time import maybe_s_to_ms -__all__ = ['Message', 'StdChannel', 'Management', 'Transport'] +__all__ = ('Message', 'StdChannel', 'Management', 'Transport') RABBITMQ_QUEUE_ARGUMENTS = { # type: Mapping[str, Tuple[str, Callable]] 'expires': ('x-expires', maybe_s_to_ms), diff --git a/kombu/transport/virtual/__init__.py b/kombu/transport/virtual/__init__.py index 6960104c..e2ee0b5d 100644 --- a/kombu/transport/virtual/__init__.py +++ b/kombu/transport/virtual/__init__.py @@ -6,8 +6,8 @@ from .base import ( Empty, binding_key_t, queue_binding_t, ) -__all__ = [ +__all__ = ( 'Base64', 'NotEquivalentError', 'UndeliverableWarning', 'BrokerState', 'QoS', 'Message', 'AbstractChannel', 'Channel', 'Management', 'Transport', 'Empty', 'binding_key_t', 'queue_binding_t', -] +) diff --git a/kombu/utils/__init__.py b/kombu/utils/__init__.py index f06b5504..da984d68 100644 --- a/kombu/utils/__init__.py +++ b/kombu/utils/__init__.py @@ -11,10 +11,10 @@ from .imports import symbol_by_name from .objects import cached_property from .uuid import uuid -__all__ = [ +__all__ = ( 'EqualityDict', 'uuid', 'maybe_list', 'fxrange', 'fxrangemax', 'retry_over_time', 'emergency_dump_state', 'cached_property', 'register_after_fork', 'reprkwargs', 'reprcall', 'symbol_by_name', 'nested', 'fileno', 'maybe_fileno', -] +) diff --git a/kombu/utils/debug.py b/kombu/utils/debug.py index e513b8c8..455f1b1f 100644 --- a/kombu/utils/debug.py +++ b/kombu/utils/debug.py @@ -8,7 +8,7 @@ from vine.utils import wraps from kombu.five import items, python_2_unicode_compatible from kombu.log import get_logger -__all__ = ['setup_logging', 'Logwrapped'] +__all__ = ('setup_logging', 'Logwrapped') def setup_logging(loglevel=logging.DEBUG, loggers=['kombu.connection', diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py index 523d8d67..71684941 100644 --- a/kombu/utils/eventio.py +++ b/kombu/utils/eventio.py @@ -12,7 +12,7 @@ from numbers import Integral from . import fileno from .compat import detect_environment -__all__ = ['poll'] +__all__ = ('poll') _selectf = __select__.select _selecterr = __select__.error diff --git a/kombu/utils/functional.py b/kombu/utils/functional.py index 12123b0b..252b757e 100644 --- a/kombu/utils/functional.py +++ b/kombu/utils/functional.py @@ -17,10 +17,10 @@ from kombu.five import ( from .encoding import safe_repr as _safe_repr -__all__ = [ +__all__ = ( 'LRUCache', 'memoize', 'lazy', 'maybe_evaluate', 'is_list', 'maybe_list', 'dictfilter', -] +) KEYWORD_MARK = object() diff --git a/kombu/utils/limits.py b/kombu/utils/limits.py index 1a9ee3b6..172716c1 100644 --- a/kombu/utils/limits.py +++ b/kombu/utils/limits.py @@ -5,7 +5,7 @@ from collections import deque from kombu.five import monotonic -__all__ = ['TokenBucket'] +__all__ = ('TokenBucket') class TokenBucket(object): diff --git a/kombu/utils/scheduling.py b/kombu/utils/scheduling.py index 0cee9e80..9bc4d936 100644 --- a/kombu/utils/scheduling.py +++ b/kombu/utils/scheduling.py @@ -7,9 +7,9 @@ from kombu.five import python_2_unicode_compatible from .imports import symbol_by_name -__all__ = [ +__all__ = ( 'FairCycle', 'priority_cycle', 'round_robin_cycle', 'sorted_cycle', -] +) CYCLE_ALIASES = { 'priority': 'kombu.utils.scheduling:priority_cycle', diff --git a/kombu/utils/time.py b/kombu/utils/time.py index 64d31d3b..623a00a1 100644 --- a/kombu/utils/time.py +++ b/kombu/utils/time.py @@ -1,7 +1,7 @@ """Time Utilities.""" from __future__ import absolute_import, unicode_literals -__all__ = ['maybe_s_to_ms'] +__all__ = ('maybe_s_to_ms') def maybe_s_to_ms(v): |