Reorganizes kombu.utils.__init__ package

docs/conf.py

@@ -25,5 +25,6 @@
         'kombu.async.aws.ext',
         'kombu.async.aws.sqs.ext',
         'kombu.transport.qpid_patches',
+        'kombu.utils',
     ],
 ))

docs/reference/index.rst

@@ -55,15 +55,20 @@
     kombu.transport.virtual
     kombu.transport.virtual.exchange
     kombu.serialization
-    kombu.utils
-    kombu.utils.scheduling
-    kombu.utils.eventio
-    kombu.utils.limits
+    kombu.utils.amq_manager
+    kombu.utils.collections
+    kombu.utils.compat
     kombu.utils.debug
+    kombu.utils.div
     kombu.utils.encoding
+    kombu.utils.eventio
     kombu.utils.functional
+    kombu.utils.imports
     kombu.utils.json
-    kombu.utils.url
+    kombu.utils.limits
+    kombu.utils.objects
+    kombu.utils.scheduling
     kombu.utils.text
-    kombu.utils.amq_manager
+    kombu.utils.url
+    kombu.utils.uuid
     kombu.five

docs/reference/kombu.utils.collections.rst

@@ -0,0 +1,11 @@
+==========================================================
+ Custom Collections - ``kombu.utils.collections``
+==========================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.collections
+
+.. automodule:: kombu.utils.collections
+    :members:
+    :undoc-members:

docs/reference/kombu.utils.compat.rst

@@ -0,0 +1,11 @@
+==========================================================
+ Python Compatibility - ``kombu.utils.compat``
+==========================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.compat
+
+.. automodule:: kombu.utils.compat
+    :members:
+    :undoc-members:

docs/reference/kombu.utils.rst → docs/reference/kombu.utils.div.rst

@@ -1,11 +1,11 @@
 ==========================================================
- Utilities - ``kombu.utils``
+ Div Utilities - ``kombu.utils.div``
 ==========================================================
 
 .. contents::
     :local:
-.. currentmodule:: kombu.utils
+.. currentmodule:: kombu.utils.div
 
-.. automodule:: kombu.utils
+.. automodule:: kombu.utils.div
     :members:
     :undoc-members:

docs/reference/kombu.utils.imports.rst

@@ -0,0 +1,11 @@
+==========================================================
+ Module Importing Utilities - ``kombu.utils.imports``
+==========================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.imports
+
+.. automodule:: kombu.utils.imports
+    :members:
+    :undoc-members:

docs/reference/kombu.utils.objects.rst

@@ -0,0 +1,11 @@
+==========================================================
+ Object/Property Utilities - ``kombu.utils.objects``
+==========================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.objects
+
+.. automodule:: kombu.utils.objects
+    :members:
+    :undoc-members:

docs/reference/kombu.utils.uuid.rst

@@ -0,0 +1,11 @@
+==========================================================
+ UUID Utilities - ``kombu.utils.uuid``
+==========================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.uuid
+
+.. automodule:: kombu.utils.uuid
+    :members:
+    :undoc-members:

docs/userguide/consumers.rst

@@ -37,7 +37,7 @@ Draining events from several consumers:
 
 .. code-block:: python
 
-    from kombu.utils import nested
+    from kombu.utils.compat import nested
 
     with connection.channel(), connection.channel() as (channel1, channel2):
         with nested(Consumer(channel1, queues1, accept=['json']),

examples/rpc-tut6/rpc_client.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 from __future__ import absolute_import, unicode_literals
 
-from kombu import Connection, Producer, Consumer, Queue
-from kombu.utils import uuid
+from kombu import Connection, Producer, Consumer, Queue, uuid
 
 
 class FibonacciRpcClient(object):

examples/simple_task_queue/worker.py

@@ -2,7 +2,7 @@
 
 from kombu.mixins import ConsumerMixin
 from kombu.log import get_logger
-from kombu.utils import reprcall
+from kombu.utils.functional import reprcall
 
 from .queues import task_queues
 

funtests/tests/test_mongodb.py

@@ -2,7 +2,7 @@
 
 from kombu import Consumer, Producer, Exchange, Queue
 from kombu.five import range
-from kombu.utils import nested
+from kombu.utils.compat import nested
 
 from funtests import transport
 

kombu/abstract.py

@@ -6,7 +6,7 @@
 from .connection import maybe_channel
 from .exceptions import NotBoundError
 from .five import python_2_unicode_compatible
-from .utils import ChannelPromise
+from .utils.functional import ChannelPromise
 
 __all__ = ['Object', 'MaybeChannelBound']
 

kombu/async/debug.py

@@ -2,8 +2,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from kombu.five import items, string_t
-from kombu.utils import reprcall
 from kombu.utils.eventio import READ, WRITE, ERR
+from kombu.utils.functional import reprcall
 
 
 def repr_flag(flag):

kombu/async/http/base.py

@@ -6,7 +6,7 @@
 
 from kombu.exceptions import HttpError
 from kombu.five import items, python_2_unicode_compatible
-from kombu.utils import coro
+from kombu.utils.compat import coro
 from kombu.utils.encoding import bytes_to_str
 from kombu.utils.functional import maybe_list, memoize
 
@@ -223,7 +223,7 @@ def __init__(self, hub, **kwargs):
         self._header_parser = header_parser()
 
     def perform(self, request, **kwargs):
-        for req in maybe_list(request):
+        for req in maybe_list(request) or []:
             if not isinstance(req, self.Request):
                 req = self.Request(req, **kwargs)
             self.add_request(req)

kombu/async/hub.py

@@ -12,8 +12,9 @@
 
 from kombu.five import Empty, python_2_unicode_compatible, range
 from kombu.log import get_logger
-from kombu.utils import cached_property, fileno
+from kombu.utils.compat import fileno
 from kombu.utils.eventio import READ, WRITE, ERR, poll
+from kombu.utils.objects import cached_property
 
 from .timer import Timer
 

kombu/common.py

@@ -17,7 +17,7 @@
 from .five import bytes_if_py2, range
 from .log import get_logger
 from .serialization import registry as serializers
-from .utils import uuid
+from .utils.uuid import uuid
 
 try:
     from _thread import get_ident

kombu/connection.py

@@ -12,12 +12,14 @@
 # jython breaks on relative import for .exceptions for some reason
 # (Issue #112)
 from kombu import exceptions
+
 from .five import bytes_if_py2, python_2_unicode_compatible, string_t, text_t
 from .log import get_logger
 from .resource import Resource
 from .transport import get_transport_cls, supports_librabbitmq
-from .utils import cached_property, retry_over_time, shufflecycle, HashedSeq
-from .utils.functional import dictfilter, lazy
+from .utils.collections import HashedSeq
+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']

kombu/log.py

@@ -8,9 +8,9 @@
 from logging.handlers import WatchedFileHandler
 
 from .five import string_t
-from .utils import cached_property
 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']
 

kombu/messaging.py

@@ -1,10 +1,4 @@
-"""
-kombu.messaging
-===============
-
-Sending and receiving messages.
-
-"""
+"""Sending and receiving messages."""
 from __future__ import absolute_import, unicode_literals
 
 from itertools import count
@@ -16,7 +10,7 @@
 from .exceptions import ContentDisallowed
 from .five import items, python_2_unicode_compatible, text_t, values
 from .serialization import dumps, prepare_accept_content
-from .utils import ChannelPromise, maybe_list
+from .utils.functional import ChannelPromise, maybe_list
 
 __all__ = ['Exchange', 'Queue', 'Producer', 'Consumer']
 

kombu/mixins.py

@@ -19,9 +19,10 @@
 from .five import range
 from .messaging import Consumer, Producer
 from .log import get_logger
-from .utils import cached_property, nested
+from .utils.compat import nested
 from .utils.encoding import safe_repr
 from .utils.limits import TokenBucket
+from .utils.objects import cached_property
 
 __all__ = ['ConsumerMixin']
 

kombu/pidbox.py

@@ -17,8 +17,9 @@
 from .exceptions import InconsistencyError
 from .five import range
 from .log import get_logger
-from .utils import cached_property, uuid, reprcall
-from .utils.functional import maybe_evaluate
+from .utils.functional import maybe_evaluate, reprcall
+from .utils.objects import cached_property
+from .utils.uuid import uuid
 
 REPLY_QUEUE_EXPIRES = 10
 

kombu/pools.py

@@ -8,7 +8,8 @@
 from .connection import Resource
 from .five import range, values
 from .messaging import Producer
-from .utils import EqualityDict, register_after_fork
+from .utils.collections import EqualityDict
+from .utils.compat import register_after_fork
 from .utils.functional import lazy
 
 __all__ = ['ProducerPool', 'PoolGroup', 'register_group',

kombu/resource.py

@@ -7,7 +7,7 @@
 
 from . import exceptions
 from .five import Empty, LifoQueue as _LifoQueue
-from .utils import register_after_fork
+from .utils.compat import register_after_fork
 from .utils.functional import lazy
 
 

kombu/serialization.py

@@ -19,7 +19,7 @@
     ContentDisallowed, DecodeError, EncodeError, SerializerNotInstalled
 )
 from .five import reraise, text_t
-from .utils import entrypoints
+from .utils.compat import entrypoints
 from .utils.encoding import bytes_to_str, str_to_bytes, bytes_t
 
 __all__ = ['pickle', 'loads', 'dumps', 'register', 'unregister']

kombu/tests/async/aws/sqs/test_connection.py

@@ -6,7 +6,7 @@
 )
 from kombu.async.aws.sqs.message import AsyncMessage
 from kombu.async.aws.sqs.queue import AsyncQueue
-from kombu.utils import uuid
+from kombu.utils.uuid import uuid
 
 from kombu.tests.async.aws.case import AWSCase
 from kombu.tests.case import PromiseMock, Mock

kombu/tests/async/aws/sqs/test_message.py

@@ -5,7 +5,7 @@
 
 from kombu.tests.async.aws.case import AWSCase
 from kombu.tests.case import PromiseMock, Mock
-from kombu.utils import uuid
+from kombu.utils.uuid import uuid
 
 
 class test_AsyncMessage(AWSCase):

kombu/tests/test_messaging.py

@@ -7,8 +7,8 @@
 
 from kombu import Connection, Consumer, Producer, Exchange, Queue
 from kombu.exceptions import MessageStateError
-from kombu.utils import ChannelPromise
 from kombu.utils import json
+from kombu.utils.functional import ChannelPromise
 
 from .case import Case, Mock, patch
 from .mocks import Transport

kombu/tests/test_pidbox.py

@@ -6,7 +6,7 @@
 from kombu import Connection
 from kombu import pidbox
 from kombu.exceptions import ContentDisallowed, InconsistencyError
-from kombu.utils import uuid
+from kombu.utils.uuid import uuid
 
 from .case import Case, Mock, patch
 

kombu/tests/test_pools.py

@@ -3,7 +3,7 @@
 from kombu import Connection, Producer
 from kombu import pools
 from kombu.connection import ConnectionPool
-from kombu.utils import eqhash
+from kombu.utils.collections import eqhash
 
 from .case import Case, Mock
 

kombu/tests/transport/virtual/test_base.py

@@ -4,10 +4,10 @@
 import warnings
 
 from kombu import Connection
+from kombu.compression import compress
 from kombu.exceptions import ResourceError, ChannelError
 from kombu.transport import virtual
-from kombu.utils import uuid
-from kombu.compression import compress
+from kombu.utils.uuid import uuid
 
 from kombu.tests.case import Case, MagicMock, Mock, mock, patch
 

kombu/tests/utils/test_compat.py

@@ -0,0 +1,32 @@
+from __future__ import absolute_import, unicode_literals
+
+from kombu.utils.compat import entrypoints, maybe_fileno
+
+from kombu.tests.case import Case, Mock, mock, patch
+
+
+class test_entrypoints(Case):
+
+    @mock.mask_modules('pkg_resources')
+    def test_without_pkg_resources(self):
+        self.assertListEqual(list(entrypoints('kombu.test')), [])
+
+    @mock.module_exists('pkg_resources')
+    def test_with_pkg_resources(self):
+        with patch('pkg_resources.iter_entry_points', create=True) as iterep:
+            eps = iterep.return_value = [Mock(), Mock()]
+
+            self.assertTrue(list(entrypoints('kombu.test')))
+            iterep.assert_called_with('kombu.test')
+            eps[0].load.assert_called_with()
+            eps[1].load.assert_called_with()
+
+
+class test_maybe_fileno(Case):
+
+    def test_maybe_fileno(self):
+        self.assertEqual(maybe_fileno(3), 3)
+        f = Mock(name='file')
+        self.assertIs(maybe_fileno(f), f.fileno())
+        f.fileno.side_effect = ValueError()
+        self.assertIsNone(maybe_fileno(f))