Reorganizes kombu.utils.__init__ package

11 files changed, 16 insertions, 13 deletions

diff --git a/kombu/transport/SLMQ.py b/kombu/transport/SLMQ.py
index 4515e0d3..689046f7 100644
--- a/kombu/transport/SLMQ.py
+++ b/kombu/transport/SLMQ.py
@@ -7,9 +7,9 @@ import string
 import os
 
 from kombu.five import Empty, text_t
-from kombu.utils import cached_property  # , uuid
 from kombu.utils.encoding import bytes_to_str, safe_str
 from kombu.utils.json import loads, dumps
+from kombu.utils.objects import cached_property
 
 from . import virtual
 
diff --git a/kombu/transport/SQS.py b/kombu/transport/SQS.py
index ac2f58a7..0f1679c1 100644
--- a/kombu/transport/SQS.py
+++ b/kombu/transport/SQS.py
@@ -51,10 +51,10 @@ from kombu.async.aws.sqs.ext import regions
 from kombu.async.aws.sqs.message import Message
 from kombu.five import Empty, range, string_t, text_t
 from kombu.log import get_logger
-from kombu.utils import cached_property
+from kombu.utils import scheduling
 from kombu.utils.encoding import bytes_to_str, safe_str
 from kombu.utils.json import loads, dumps
-from kombu.utils import scheduling
+from kombu.utils.objects import cached_property
 
 from . import virtual
 
diff --git a/kombu/transport/__init__.py b/kombu/transport/__init__.py
index ff4bf69c..57b67236 100644
--- a/kombu/transport/__init__.py
+++ b/kombu/transport/__init__.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 
 from kombu.five import string_t
 from kombu.syn import _detect_environment
-from kombu.utils import symbol_by_name
+from kombu.utils.imports import symbol_by_name
 
 
 def supports_librabbitmq():
diff --git a/kombu/transport/base.py b/kombu/transport/base.py
index 7eeace88..4e2d6a9d 100644
--- a/kombu/transport/base.py
+++ b/kombu/transport/base.py
@@ -8,7 +8,7 @@ from amqp.exceptions import RecoverableConnectionError
 
 from kombu.exceptions import ChannelError, ConnectionError
 from kombu.message import Message
-from kombu.utils import cached_property
+from kombu.utils.objects import cached_property
 
 __all__ = ['Message', 'StdChannel', 'Management', 'Transport']
 
diff --git a/kombu/transport/consul.py b/kombu/transport/consul.py
index 898d68fa..2598e473 100644
--- a/kombu/transport/consul.py
+++ b/kombu/transport/consul.py
@@ -15,8 +15,8 @@ from contextlib import contextmanager
 from kombu.exceptions import ChannelError
 from kombu.five import Empty, monotonic
 from kombu.log import get_logger
-from kombu.utils import cached_property
 from kombu.utils.json import loads, dumps
+from kombu.utils.objects import cached_property
 
 from . import virtual
 
diff --git a/kombu/transport/filesystem.py b/kombu/transport/filesystem.py
index 55a32f7e..1bace4cf 100644
--- a/kombu/transport/filesystem.py
+++ b/kombu/transport/filesystem.py
@@ -12,9 +12,9 @@ import tempfile
 from . import virtual
 from kombu.exceptions import ChannelError
 from kombu.five import Empty, monotonic
-from kombu.utils import cached_property
 from kombu.utils.encoding import bytes_to_str, str_to_bytes
 from kombu.utils.json import loads, dumps
+from kombu.utils.objects import cached_property
 
 
 VERSION = (1, 0, 0)
diff --git a/kombu/transport/mongodb.py b/kombu/transport/mongodb.py
index 528b9970..1c1e0280 100644
--- a/kombu/transport/mongodb.py
+++ b/kombu/transport/mongodb.py
@@ -17,7 +17,7 @@ from kombu.five import Empty
 from kombu.syn import _detect_environment
 from kombu.utils.encoding import bytes_to_str
 from kombu.utils.json import loads, dumps
-from kombu.utils import cached_property
+from kombu.utils.objects import cached_property
 
 from . import virtual
 
diff --git a/kombu/transport/pyro.py b/kombu/transport/pyro.py
index 5a726dac..8fb15ad6 100644
--- a/kombu/transport/pyro.py
+++ b/kombu/transport/pyro.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import, unicode_literals
 import sys
 
 from kombu.five import reraise
-from kombu.utils import cached_property
+from kombu.utils.objects import cached_property
 
 from . import virtual
 
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index d020eaa0..f1dc3d48 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -14,12 +14,14 @@ from vine import promise
 from kombu.exceptions import InconsistencyError, VersionMismatch
 from kombu.five import Empty, values, string_t
 from kombu.log import get_logger
-from kombu.utils import cached_property, register_after_fork, uuid
+from kombu.utils.compat import register_after_fork
 from kombu.utils.eventio import poll, READ, ERR
 from kombu.utils.encoding import bytes_to_str
 from kombu.utils.json import loads, dumps
+from kombu.utils.objects import cached_property
 from kombu.utils.scheduling import cycle_by_name
 from kombu.utils.url import _parse_url
+from kombu.utils.uuid import uuid
 
 from . import virtual
 
diff --git a/kombu/transport/virtual/__init__.py b/kombu/transport/virtual/__init__.py
index d6bd6ef9..5940159b 100644
--- a/kombu/transport/virtual/__init__.py
+++ b/kombu/transport/virtual/__init__.py
@@ -20,9 +20,10 @@ from amqp.protocol import queue_declare_ok_t
 from kombu.exceptions import ResourceError, ChannelError
 from kombu.five import Empty, items, monotonic
 from kombu.log import get_logger
-from kombu.utils import emergency_dump_state, uuid
 from kombu.utils.encoding import str_to_bytes, bytes_to_str
+from kombu.utils.div import emergency_dump_state
 from kombu.utils.scheduling import FairCycle
+from kombu.utils.uuid import uuid
 
 from kombu.transport import base
 
diff --git a/kombu/transport/virtual/exchange.py b/kombu/transport/virtual/exchange.py
index 3f2de089..c61d7147 100644
--- a/kombu/transport/virtual/exchange.py
+++ b/kombu/transport/virtual/exchange.py
@@ -5,10 +5,10 @@ by the AMQ protocol  (excluding the `headers` exchange).
 """
 from __future__ import absolute_import, unicode_literals
 
-from kombu.utils import escape_regex
-
 import re
 
+from kombu.utils.text import escape_regex
+
 
 class ExchangeType(object):
     """Implements the specifics for an exchange type.