Armin sez only to use one dot, and he's right

celery/app/__init__.py

@@ -13,7 +13,7 @@ from __future__ import absolute_import
 
 import os
 
-from ..local import Proxy
+from celery.local import Proxy
 
 from . import state
 from .base import App, AppPickler  # noqa

celery/app/amqp.py

@@ -17,9 +17,9 @@ from kombu import BrokerConnection, Exchange
 from kombu import compat as messaging
 from kombu.pools import ProducerPool
 
-from .. import signals
-from ..utils import cached_property, lpmerge, uuid
-from ..utils import text
+from celery import signals
+from celery.utils import cached_property, lpmerge, uuid
+from celery.utils import text
 
 from . import routes as _routes
 

celery/app/annotations.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from ..utils.functional import firstmethod, mpromise
-from ..utils.imports import instantiate
+from celery.utils.functional import firstmethod, mpromise
+from celery.utils.imports import instantiate
 
 _first_match = firstmethod("annotate")
 _first_match_any = firstmethod("annotate_any")

celery/app/base.py

@@ -21,14 +21,14 @@ from functools import wraps
 
 from kombu.clocks import LamportClock
 
-from .. import platforms
-from ..backends import get_backend_by_url
-from ..exceptions import AlwaysEagerIgnored
-from ..loaders import get_loader_cls
-from ..local import PromiseProxy, maybe_evaluate
-from ..utils import cached_property, register_after_fork
-from ..utils.functional import first
-from ..utils.imports import instantiate, symbol_by_name
+from celery import platforms
+from celery.backends import get_backend_by_url
+from celery.exceptions import AlwaysEagerIgnored
+from celery.loaders import get_loader_cls
+from celery.local import PromiseProxy, maybe_evaluate
+from celery.utils import cached_property, register_after_fork
+from celery.utils.functional import first
+from celery.utils.imports import instantiate, symbol_by_name
 
 from . import annotations
 from .builtins import load_builtin_tasks

celery/app/builtins.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-from ..utils import uuid
+from celery.utils import uuid
 
 #: global list of functions defining a built-in task.
 #: these are called for every app instance to setup built-in task.
@@ -49,8 +49,8 @@ def add_unlock_chord_task(app):
     It creates a task chain polling the header for completion.
 
     """
-    from ..result import AsyncResult, TaskSetResult
-    from ..task.sets import subtask
+    from celery.result import AsyncResult, TaskSetResult
+    from celery.task.sets import subtask
 
     @app.task(name="celery.chord_unlock", max_retries=None)
     def unlock_chord(setid, callback, interval=1, propagate=False,
@@ -70,7 +70,7 @@ def add_chord_task(app):
     """Every chord is executed in a dedicated task, so that the chord
     can be used as a subtask, and this generates the task
     responsible for that."""
-    from ..task.sets import TaskSet
+    from celery.task.sets import TaskSet
 
     @app.task(name="celery.chord", accept_magic_kwargs=False)
     def chord(set, body, interval=1, max_retries=None,

celery/app/defaults.py

@@ -16,7 +16,7 @@ import sys
 from collections import deque
 from datetime import timedelta
 
-from ..utils.functional import memoize
+from celery.utils.functional import memoize
 
 is_jython = sys.platform.startswith("java")
 is_pypy = hasattr(sys, "pypy_version_info")

celery/app/log.py

@@ -4,15 +4,17 @@ import logging
 import os
 import sys
 
-from .. import signals
-from ..utils import isatty
-from ..utils.compat import LoggerAdapter, WatchedFileHandler
-from ..utils.log import (ColorFormatter, ensure_process_aware_logger,
-                         LoggingProxy, get_multiprocessing_logger,
-                         reset_multiprocessing_logger, mlevel)
-from ..utils.term import colored
-
-is_py3k = sys.version_info >= (3, 0)
+from celery import signals
+from celery.utils import isatty
+from celery.utils.compat import LoggerAdapter, WatchedFileHandler
+from celery.utils.log import (
+    ColorFormatter, ensure_process_aware_logger,
+    LoggingProxy, get_multiprocessing_logger,
+    reset_multiprocessing_logger, mlevel
+)
+from celery.utils.term import colored
+
+is_py3k = sys.version_info[0] == 3
 
 
 class Logging(object):

celery/app/registry.py

@@ -13,8 +13,8 @@ from __future__ import absolute_import
 
 import inspect
 
-from .. import current_app
-from ..exceptions import NotRegistered
+from celery import current_app
+from celery.exceptions import NotRegistered
 
 
 class TaskRegistry(dict):

celery/app/routes.py

@@ -12,10 +12,10 @@
 """
 from __future__ import absolute_import
 
-from ..exceptions import QueueNotFound
-from ..utils import lpmerge
-from ..utils.functional import firstmethod, mpromise
-from ..utils.imports import instantiate
+from celery.exceptions import QueueNotFound
+from celery.utils import lpmerge
+from celery.utils.functional import firstmethod, mpromise
+from celery.utils.imports import instantiate
 
 _first_route = firstmethod("route_for_task")
 

celery/app/task/__init__.py

@@ -15,18 +15,18 @@ from __future__ import absolute_import
 import sys
 import threading
 
-from ... import current_app
-from ... import states
-from ...datastructures import ExceptionInfo
-from ...exceptions import MaxRetriesExceededError, RetryTaskError
-from ...result import EagerResult
-from ...utils import fun_takes_kwargs, uuid, maybe_reraise
-from ...utils.functional import mattrgetter, maybe_list
-from ...utils.imports import instantiate
-from ...utils.mail import ErrorMail
-
-from ..state import current_task
-from ..registry import _unpickle_task
+from celery import current_app
+from celery import states
+from celery.datastructures import ExceptionInfo
+from celery.exceptions import MaxRetriesExceededError, RetryTaskError
+from celery.result import EagerResult
+from celery.utils import fun_takes_kwargs, uuid, maybe_reraise
+from celery.utils.functional import mattrgetter, maybe_list
+from celery.utils.imports import instantiate
+from celery.utils.mail import ErrorMail
+
+from celery.app.state import current_task
+from celery.app.registry import _unpickle_task
 
 #: extracts options related to publishing a message from a dict.
 extract_exec_options = mattrgetter("queue", "routing_key",
@@ -649,7 +649,7 @@ class BaseTask(object):
 
         """
         # trace imports BaseTask, so need to import inline.
-        from ...execute.trace import eager_trace_task
+        from celery.execute.trace import eager_trace_task
 
         app = self._get_app()
         args = args or []
@@ -808,7 +808,7 @@ class BaseTask(object):
         """Returns :class:`~celery.task.sets.subtask` object for
         this task, wrapping arguments and execution options
         for a single task invocation."""
-        from ...task.sets import subtask
+        from celery.task.sets import subtask
         return subtask(self, *args, **kwargs)
 
     @property

celery/app/utils.py

@@ -5,10 +5,10 @@ import kombu
 import os
 import platform as _platform
 
-from .. import datastructures
-from .. import platforms
-from ..utils.text import pretty
-from ..utils.imports import qualname
+from celery import datastructures
+from celery import platforms
+from celery.utils.text import pretty
+from celery.utils.imports import qualname
 
 from .defaults import find
 

celery/apps/beat.py

@@ -5,13 +5,12 @@ import atexit
 import socket
 import sys
 
-from .. import __version__, platforms
-from .. import beat
-from ..app import app_or_default
-from ..app.abstract import configurated, from_config
-from ..utils.imports import qualname
-from ..utils.log import LOG_LEVELS
-from ..utils.timeutils import humanize_seconds
+from celery import __version__, platforms, beat
+from celery.app import app_or_default
+from celery.app.abstract import configurated, from_config
+from celery.utils.imports import qualname
+from celery.utils.log import LOG_LEVELS
+from celery.utils.timeutils import humanize_seconds
 
 STARTUP_INFO_FMT = """
 Configuration ->

celery/apps/worker.py

@@ -12,15 +12,15 @@ import socket
 import sys
 import warnings
 
-from .. import __version__, platforms, signals
-from ..app import app_or_default
-from ..app.abstract import configurated, from_config
-from ..exceptions import ImproperlyConfigured, SystemTerminate
-from ..utils import cry, isatty
-from ..utils.imports import qualname
-from ..utils.log import LOG_LEVELS, mlevel
-from ..utils.text import pluralize
-from ..worker import WorkController
+from celery import __version__, platforms, signals
+from celery.app import app_or_default
+from celery.app.abstract import configurated, from_config
+from celery.exceptions import ImproperlyConfigured, SystemTerminate
+from celery.utils import cry, isatty
+from celery.utils.imports import qualname
+from celery.utils.log import LOG_LEVELS, mlevel
+from celery.utils.text import pluralize
+from celery.worker import WorkController
 
 try:
     from greenlet import GreenletExit
@@ -346,7 +346,7 @@ def install_rdb_handler(envvar="CELERY_RDBSIG"):  # pragma: no cover
 
     def rdb_handler(signum, frame):
         """Signal handler setting a rdb breakpoint at the current frame."""
-        from ..contrib import rdb
+        from celery.contrib import rdb
         rdb.set_trace(frame)
 
     if os.environ.get(envvar):

celery/backends/__init__.py

@@ -5,10 +5,10 @@ import sys
 
 from kombu.utils.url import _parse_url
 
-from .. import current_app
-from ..local import Proxy
-from ..utils.imports import symbol_by_name
-from ..utils.functional import memoize
+from celery import current_app
+from celery.local import Proxy
+from celery.utils.imports import symbol_by_name
+from celery.utils.functional import memoize
 
 UNKNOWN_BACKEND = """\
 Unknown result backend: %r.  Did you spell that correctly? (%r)\

celery/backends/amqp.py

@@ -11,8 +11,8 @@ from itertools import count
 from kombu.entity import Exchange, Queue
 from kombu.messaging import Consumer, Producer
 
-from .. import states
-from ..exceptions import TimeoutError
+from celery import states
+from celery.exceptions import TimeoutError
 
 from .base import BaseDictBackend
 

celery/backends/base.py

@@ -10,12 +10,12 @@ from datetime import timedelta
 from kombu import serialization
 from kombu.utils.encoding import bytes_to_str, ensure_bytes, from_utf8
 
-from .. import states
-from ..app import current_task
-from ..datastructures import LRUCache
-from ..exceptions import TimeoutError, TaskRevokedError
-from ..utils import timeutils
-from ..utils.serialization import (
+from celery import states
+from celery.app import current_task
+from celery.datastructures import LRUCache
+from celery.exceptions import TimeoutError, TaskRevokedError
+from celery.utils import timeutils
+from celery.utils.serialization import (
         get_pickled_exception,
         get_pickleable_exception,
         create_exception_cls,
@@ -47,7 +47,7 @@ class BaseBackend(object):
     supports_native_join = False
 
     def __init__(self, *args, **kwargs):
-        from ..app import app_or_default
+        from celery.app import app_or_default
         self.app = app_or_default(kwargs.get("app"))
         self.serializer = kwargs.get("serializer",
                                      self.app.conf.CELERY_RESULT_SERIALIZER)

celery/backends/cache.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-from ..datastructures import LRUCache
-from ..exceptions import ImproperlyConfigured
-from ..utils import cached_property
+from celery.datastructures import LRUCache
+from celery.exceptions import ImproperlyConfigured
+from celery.utils import cached_property
 
 from .base import KeyValueStoreBackend
 
@@ -104,8 +104,8 @@ class CacheBackend(KeyValueStoreBackend):
         self.client.set(key, '0', time=86400)
 
     def on_chord_part_return(self, task, propagate=False):
-        from ..task.sets import subtask
-        from ..result import TaskSetResult
+        from celery.task.sets import subtask
+        from celery.result import TaskSetResult
         setid = task.request.taskset
         if not setid:
             return

celery/backends/cassandra.py

@@ -12,9 +12,9 @@ except ImportError:
 import socket
 import time
 
-from .. import states
-from ..exceptions import ImproperlyConfigured
-from ..utils.timeutils import maybe_timedelta, timedelta_seconds
+from celery import states
+from celery.exceptions import ImproperlyConfigured
+from celery.utils.timeutils import maybe_timedelta, timedelta_seconds
 
 from .base import BaseDictBackend
 

celery/backends/mongodb.py

@@ -9,9 +9,9 @@ try:
 except ImportError:
     pymongo = None  # noqa
 
-from .. import states
-from ..exceptions import ImproperlyConfigured
-from ..utils.timeutils import maybe_timedelta
+from celery import states
+from celery.exceptions import ImproperlyConfigured
+from celery.utils.timeutils import maybe_timedelta
 
 from .base import BaseDictBackend
 

celery/backends/redis.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import
 
 from kombu.utils.url import _parse_url
 
-from ..exceptions import ImproperlyConfigured
-from ..utils import cached_property
+from celery.exceptions import ImproperlyConfigured
+from celery.utils import cached_property
 
 from .base import KeyValueStoreBackend
 
@@ -91,8 +91,8 @@ class RedisBackend(KeyValueStoreBackend):
         self.app.TaskSetResult(setid, result).save()
 
     def on_chord_part_return(self, task, propagate=False):
-        from ..task.sets import subtask
-        from ..result import TaskSetResult
+        from celery.task.sets import subtask
+        from celery.result import TaskSetResult
         setid = task.request.taskset
         if not setid:
             return

celery/backends/tyrant.py

@@ -7,7 +7,7 @@ try:
 except ImportError:
     pytyrant = None  # noqa
 
-from ..exceptions import ImproperlyConfigured
+from celery.exceptions import ImproperlyConfigured
 
 from .base import KeyValueStoreBackend
 

celery/bin/base.py

@@ -7,9 +7,10 @@ import warnings
 
 from optparse import OptionParser, make_option as Option
 
-from .. import __version__, Celery
-from ..exceptions import CDeprecationWarning, CPendingDeprecationWarning
-from ..platforms import EX_FAILURE, EX_USAGE
+from celery import Celery, __version__
+from celery.exceptions import CDeprecationWarning, CPendingDeprecationWarning
+from celery.platforms import EX_FAILURE, EX_USAGE
+from celery.utils.imports import symbol_by_name, import_from_cwd
 
 # always enable DeprecationWarnings, so our users can see them.
 for warning in (CDeprecationWarning, CPendingDeprecationWarning):
@@ -183,7 +184,6 @@ class Command(object):
         return argv
 
     def symbol_by_name(self, name):
-        from ..utils.imports import symbol_by_name, import_from_cwd
         return symbol_by_name(name, imp=import_from_cwd)
     get_cls_by_name = symbol_by_name  # XXX compat
 

celery/bin/camqadm.py

@@ -18,8 +18,8 @@ from itertools import count
 
 from amqplib import client_0_8 as amqp
 
-from ..app import app_or_default
-from ..utils.functional import padlist
+from celery.app import app_or_default
+from celery.utils.functional import padlist
 
 from .base import Command
 

celery/bin/celery.py

@@ -13,15 +13,15 @@ from optparse import OptionParser, make_option as Option
 from pprint import pformat
 from textwrap import wrap
 
-from .. import __version__
-from ..app import app_or_default, current_app
-from ..platforms import EX_OK, EX_FAILURE, EX_UNAVAILABLE, EX_USAGE
-from ..utils import term
-from ..utils.imports import symbol_by_name
-from ..utils.text import pluralize
-from ..utils.timeutils import maybe_iso8601
+from celery import __version__
+from celery.app import app_or_default, current_app
+from celery.platforms import EX_OK, EX_FAILURE, EX_UNAVAILABLE, EX_USAGE
+from celery.utils import term
+from celery.utils.imports import symbol_by_name
+from celery.utils.text import pluralize
+from celery.utils.timeutils import maybe_iso8601
 
-from ..bin.base import Command as BaseCommand
+from .base import Command as BaseCommand
 
 HELP = """
 Type '%(prog_name)s <command> --help' for help using
@@ -385,7 +385,7 @@ class migrate(Command):
         if len(args) != 2:
             return self.show_help("migrate")
         from kombu import BrokerConnection
-        from ..contrib.migrate import migrate_tasks
+        from celery.contrib.migrate import migrate_tasks
 
         migrate_tasks(BrokerConnection(args[0]),
                       BrokerConnection(args[1]),
@@ -422,7 +422,7 @@ class shell(Command):
             import_module("celery.concurrency.eventlet")
         if gevent:
             import_module("celery.concurrency.gevent")
-        from .. import task
+        from celery import task
         self.app.loader.import_default_modules()
         self.locals = {"celery": self.app,
                        "BaseTask": task.BaseTask,

celery/bin/celerybeat.py

@@ -32,7 +32,7 @@ import os
 
 from functools import partial
 
-from ..platforms import detached
+from celery.platforms import detached
 
 from .base import Command, Option, daemon_options
 

celery/bin/celeryd.py

@@ -83,7 +83,7 @@ try:
 except ImportError:  # pragma: no cover
     freeze_support = lambda: True  # noqa
 
-from celery.bin.base import Command, Option
+from .base import Command, Option
 
 
 class WorkerCommand(Command):

celery/bin/celeryd_detach.py

@@ -10,8 +10,8 @@ import sys
 
 from optparse import OptionParser, BadOptionError
 
-from .. import __version__
-from ..platforms import detached
+from celery import __version__
+from celery.platforms import detached
 
 from .base import daemon_options, Option
 
@@ -27,7 +27,7 @@ def detach(path, argv, logfile=None, pidfile=None, uid=None,
         try:
             os.execv(path, [path] + argv)
         except Exception:
-            from .. import current_app
+            from celery import current_app
             logger = current_app.log.setup_logger("ERROR", logfile)
             logger.critical("Can't exec %r", " ".join([path] + argv),
                             exc_info=True)

celery/bin/celeryd_multi.py

@@ -103,10 +103,10 @@ from time import sleep
 
 from kombu.utils.encoding import from_utf8
 
-from .. import __version__
-from ..platforms import shellsplit
-from ..utils import term
-from ..utils.text import pluralize
+from celery import __version__
+from celery.platforms import PIDFile, shellsplit
+from celery.utils import term
+from celery.utils.text import pluralize
 
 SIGNAMES = set(sig for sig in dir(signal)
                         if sig.startswith("SIG") and "_" not in sig)
@@ -295,7 +295,6 @@ class MultiTool(object):
             self.note("")
 
     def getpids(self, p, cmd, callback=None):
-        from .. import platforms
         pidfile_template = p.options.setdefault("--pidfile", "celeryd@%n.pid")
 
         nodes = []
@@ -303,7 +302,7 @@ class MultiTool(object):
             pid = None
             pidfile = expander(pidfile_template)
             try:
-                pid = platforms.PIDFile(pidfile).read_pid()
+                pid = PIDFile(pidfile).read_pid()
             except ValueError:
                 pass
             if pid:

celery/bin/celeryev.py

@@ -10,8 +10,7 @@ import sys
 
 from functools import partial
 
-from .. import platforms
-from ..platforms import detached
+from celery.platforms import detached, set_process_title, strargv
 
 from .base import Command, Option, daemon_options
 
@@ -44,19 +43,19 @@ class EvCommand(Command):
             os.chdir(workdir)
 
     def run_evdump(self):
-        from ..events.dumper import evdump
+        from celery.events.dumper import evdump
         self.set_process_status("dump")
         return evdump(app=self.app)
 
     def run_evtop(self):
-        from ..events.cursesmon import evtop
+        from celery.events.cursesmon import evtop
         self.set_process_status("top")
         return evtop(app=self.app)
 
     def run_evcam(self, camera, logfile=None, pidfile=None, uid=None,
             gid=None, umask=None, working_directory=None,
             detach=False, **kwargs):
-        from ..events.snapshot import evcam
+        from celery.events.snapshot import evcam
         workdir = working_directory
         self.set_process_status("cam")
         kwargs["app"] = self.app
@@ -71,8 +70,8 @@ class EvCommand(Command):
 
     def set_process_status(self, prog, info=""):
         prog = "%s:%s" % (self.prog_name, prog)
-        info = "%s %s" % (info, platforms.strargv(sys.argv))
-        return platforms.set_process_title(prog, info=info)
+        info = "%s %s" % (info, strargv(sys.argv))
+        return set_process_title(prog, info=info)
 
     def get_options(self):
         return (

celery/concurrency/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-from ..utils.imports import symbol_by_name
+from celery.utils.imports import symbol_by_name
 
 ALIASES = {
     "processes": "celery.concurrency.processes:TaskPool",

celery/concurrency/base.py

@@ -8,7 +8,7 @@ import time
 from kombu.log import anon_logger
 from kombu.utils.encoding import safe_repr
 
-from ..utils import timer2
+from celery.utils import timer2
 
 _default_logger = anon_logger("celery.concurrency")
 

celery/concurrency/eventlet.py

@@ -12,8 +12,8 @@ import sys
 
 from time import time
 
-from .. import signals
-from ..utils import timer2
+from celery import signals
+from celery.utils import timer2
 
 from . import base
 

celery/concurrency/gevent.py

@@ -10,7 +10,7 @@ import sys
 
 from time import time
 
-from ..utils import timer2
+from celery.utils import timer2
 
 from .base import apply_target, BasePool
 

celery/concurrency/processes/__init__.py

@@ -6,10 +6,11 @@ import platform
 import signal as _signal
 
 
-from ... import platforms
-from ... import signals
-from ...app import app_or_default
-from ..base import BasePool
+from celery import platforms
+from celery import signals
+from celery.app import app_or_default
+from celery.concurrency.base import BasePool
+
 from .pool import Pool, RUN
 
 if platform.system() == "Windows":  # pragma: no cover

celery/events/__init__.py

@@ -25,8 +25,8 @@ from kombu.common import eventloop
 from kombu.entity import Exchange, Queue
 from kombu.messaging import Consumer, Producer
 
-from ..app import app_or_default
-from ..utils import uuid
+from celery.app import app_or_default
+from celery.utils import uuid
 
 event_exchange = Exchange("celeryev", type="topic")
 

celery/events/cursesmon.py

@@ -22,10 +22,10 @@ from itertools import count
 from textwrap import wrap
 from math import ceil
 
-from .. import __version__
-from .. import states
-from ..app import app_or_default
-from ..utils.text import abbr, abbrtask
+from celery import __version__
+from celery import states
+from celery.app import app_or_default
+from celery.utils.text import abbr, abbrtask
 
 BORDER_SPACING = 4
 LEFT_BORDER_OFFSET = 3

celery/events/dumper.py

@@ -16,8 +16,8 @@ import sys
 
 from datetime import datetime
 
-from ..app import app_or_default
-from ..datastructures import LRUCache
+from celery.app import app_or_default
+from celery.datastructures import LRUCache
 
 
 TASK_NAMES = LRUCache(limit=0xFFF)

celery/events/snapshot.py

@@ -19,13 +19,13 @@ import atexit
 
 from kombu.utils.limits import TokenBucket
 
-from .. import platforms
-from ..app import app_or_default
-from ..utils import timer2
-from ..utils.dispatch import Signal
-from ..utils.imports import instantiate
-from ..utils.log import LOG_LEVELS
-from ..utils.timeutils import rate
+from celery import platforms
+from celery.app import app_or_default
+from celery.utils import timer2
+from celery.utils.dispatch import Signal
+from celery.utils.imports import instantiate
+from celery.utils.log import LOG_LEVELS
+from celery.utils.timeutils import rate
 
 
 class Polaroid(object):

celery/events/state.py

@@ -29,8 +29,8 @@ from time import time
 
 from kombu.utils import kwdict
 
-from .. import states
-from ..datastructures import AttributeDict, LRUCache
+from celery import states
+from celery.datastructures import AttributeDict, LRUCache
 
 # The window (in percentage) is added to the workers heartbeat
 # frequency.  If the time between updates exceeds this window,

celery/execute/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
-from .. import current_app
+from celery import current_app
+from celery.local import Proxy
 
-send_task = current_app.send_task
+send_task = Proxy(lambda: current_app.send_task)

celery/execute/trace.py

@@ -25,13 +25,13 @@ import traceback
 
 from warnings import warn
 
-from .. import current_app
-from .. import states, signals
-from ..app.state import _tls
-from ..app.task import BaseTask
-from ..datastructures import ExceptionInfo
-from ..exceptions import RetryTaskError
-from ..utils.serialization import get_pickleable_exception
+from celery import current_app
+from celery import states, signals
+from celery.app.state import _tls
+from celery.app.task import BaseTask
+from celery.datastructures import ExceptionInfo
+from celery.exceptions import RetryTaskError
+from celery.utils.serialization import get_pickleable_exception
 
 send_prerun = signals.task_prerun.send
 prerun_receivers = signals.task_prerun.receivers

celery/loaders/__init__.py

@@ -12,9 +12,9 @@
 """
 from __future__ import absolute_import
 
-from .. import current_app
-from ..utils import deprecated
-from ..utils.imports import symbol_by_name
+from celery import current_app
+from celery.utils import deprecated
+from celery.utils.imports import symbol_by_name
 
 LOADER_ALIASES = {"app": "celery.loaders.app:AppLoader",
                   "default": "celery.loaders.default:Loader",

celery/loaders/base.py

@@ -22,11 +22,11 @@ from datetime import datetime
 
 from kombu.utils.encoding import safe_str
 
-from ..datastructures import DictAttribute
-from ..exceptions import ImproperlyConfigured
-from ..utils import cached_property
-from ..utils.imports import import_from_cwd, symbol_by_name
-from ..utils.functional import maybe_list
+from celery.datastructures import DictAttribute
+from celery.exceptions import ImproperlyConfigured
+from celery.utils import cached_property
+from celery.utils.imports import import_from_cwd, symbol_by_name
+from celery.utils.functional import maybe_list
 
 BUILTIN_MODULES = frozenset()
 
@@ -62,7 +62,7 @@ class BaseLoader(object):
     _conf = None
 
     def __init__(self, app=None, **kwargs):
-        from ..app import app_or_default
+        from celery.app import app_or_default
         self.app = app_or_default(app)
         self.task_modules = set()
 
@@ -141,7 +141,7 @@ class BaseLoader(object):
                 override_types={"tuple": "json",
                                 "list": "json",
                                 "dict": "json"}):
-        from ..app.defaults import Option, NAMESPACES
+        from celery.app.defaults import Option, NAMESPACES
         namespace = namespace.upper()
         typemap = dict(Option.typemap, **extra_types)
 

celery/loaders/default.py

@@ -15,9 +15,9 @@ import os
 import sys
 import warnings
 
-from ..datastructures import AttributeDict
-from ..exceptions import NotConfigured
-from ..utils.imports import NotAPackage, find_module
+from celery.datastructures import AttributeDict
+from celery.exceptions import NotConfigured
+from celery.utils.imports import NotAPackage, find_module
 
 from .base import BaseLoader
 

celery/security/__init__.py

@@ -3,8 +3,8 @@ from __future__ import with_statement
 
 from kombu.serialization import registry
 
-from .. import current_app
-from ..exceptions import ImproperlyConfigured
+from celery import current_app
+from celery.exceptions import ImproperlyConfigured
 
 from .serialization import register_auth
 

celery/security/certificate.py

@@ -10,7 +10,7 @@ try:
 except ImportError:
     crypto = None  # noqa
 
-from ..exceptions import SecurityError
+from celery.exceptions import SecurityError
 
 
 class Certificate(object):

celery/security/key.py

@@ -7,7 +7,7 @@ try:
 except ImportError:
     crypto = None  # noqa
 
-from ..exceptions import SecurityError
+from celery.exceptions import SecurityError
 
 
 class PrivateKey(object):

celery/security/serialization.py

@@ -6,7 +6,7 @@ import sys
 from kombu.serialization import registry, encode, decode
 from kombu.utils.encoding import bytes_to_str, str_to_bytes
 
-from ..exceptions import SecurityError
+from celery.exceptions import SecurityError
 
 from .certificate import Certificate, FSCertStore
 from .key import PrivateKey

celery/task/__init__.py

@@ -13,10 +13,10 @@ from __future__ import absolute_import
 
 import sys
 
-from .. import current_app
-from ..__compat__ import MagicModule, create_magic_module
-from ..app import current_task as _current_task
-from ..local import Proxy
+from celery import current_app
+from celery.__compat__ import MagicModule, create_magic_module
+from celery.app import current_task as _current_task
+from celery.local import Proxy
 
 
 class module(MagicModule):

celery/task/base.py

@@ -13,10 +13,10 @@
 """
 from __future__ import absolute_import
 
-from .. import current_app
-from ..__compat__ import class_property, reclassmethod
-from ..app.task import Context, TaskType, BaseTask  # noqa
-from ..schedules import maybe_schedule
+from celery import current_app
+from celery.__compat__ import class_property, reclassmethod
+from celery.app.task import Context, TaskType, BaseTask  # noqa
+from celery.schedules import maybe_schedule
 
 #: list of methods that are classmethods in the old API.
 _COMPAT_CLASSMETHODS = (

celery/task/chords.py

@@ -11,9 +11,9 @@
 """
 from __future__ import absolute_import
 
-from .. import current_app
-from ..local import Proxy
-from ..utils import uuid
+from celery import current_app
+from celery.local import Proxy
+from celery.utils import uuid
 
 Chord = Proxy(lambda: current_app.tasks["celery.chord"])
 

celery/task/control.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from .. import current_app
-from ..local import Proxy
+from celery import current_app
+from celery.local import Proxy
 
 
 broadcast = Proxy(lambda: current_app.control.broadcast)

celery/task/http.py

@@ -22,7 +22,7 @@ try:
 except ImportError:  # pragma: no cover
     from cgi import parse_qsl  # noqa
 
-from .. import __version__ as celery_version
+from celery import __version__ as celery_version
 from .base import Task as BaseTask
 
 GET_METHODS = frozenset(["GET", "HEAD"])

celery/task/schedules.py

@@ -2,8 +2,8 @@
 from __future__ import absolute_import
 
 import warnings
-from ..schedules import schedule, crontab_parser, crontab  # noqa
-from ..exceptions import CDeprecationWarning
+from celery.schedules import schedule, crontab_parser, crontab  # noqa
+from celery.exceptions import CDeprecationWarning
 
 warnings.warn(CDeprecationWarning(
     "celery.task.schedules is deprecated and renamed to celery.schedules"))

celery/task/sets.py

@@ -16,12 +16,12 @@ from itertools import chain
 
 from kombu.utils import reprcall
 
-from .. import current_app
-from ..app import current_task
-from ..datastructures import AttributeDict
-from ..utils import cached_property, uuid
-from ..utils.functional import maybe_list
-from ..utils.compat import UserList, chain_from_iterable
+from celery import current_app
+from celery.app import current_task
+from celery.datastructures import AttributeDict
+from celery.utils import cached_property, uuid
+from celery.utils.functional import maybe_list
+from celery.utils.compat import UserList, chain_from_iterable
 
 
 class subtask(AttributeDict):

celery/utils/__init__.py

@@ -22,7 +22,7 @@ from functools import partial, wraps
 from inspect import getargspec
 from pprint import pprint
 
-from ..exceptions import CPendingDeprecationWarning, CDeprecationWarning
+from celery.exceptions import CPendingDeprecationWarning, CDeprecationWarning
 from .compat import StringIO
 
 from .imports import symbol_by_name, qualname

celery/worker/__init__.py

@@ -23,12 +23,12 @@ import traceback
 
 from kombu.utils.finalize import Finalize
 
-from .. import concurrency as _concurrency
-from ..app import app_or_default
-from ..app.abstract import configurated, from_config
-from ..exceptions import SystemTerminate
-from ..utils.functional import noop
-from ..utils.imports import qualname, reload_from_cwd
+from celery import concurrency as _concurrency
+from celery.app import app_or_default
+from celery.app.abstract import configurated, from_config
+from celery.exceptions import SystemTerminate
+from celery.utils.functional import noop
+from celery.utils.imports import qualname, reload_from_cwd
 
 from . import abstract
 from . import state
@@ -108,7 +108,7 @@ class Beat(abstract.StartStopComponent):
         w.beat = None
 
     def create(self, w):
-        from ..beat import EmbeddedService
+        from celery.beat import EmbeddedService
         b = w.beat = EmbeddedService(app=w.app,
                                      logger=w.logger,
                                      schedule_filename=w.schedule_filename,

celery/worker/abstract.py

@@ -14,8 +14,8 @@ from __future__ import absolute_import
 from collections import defaultdict
 from importlib import import_module
 
-from ..datastructures import DependencyGraph
-from ..utils.imports import instantiate
+from celery.datastructures import DependencyGraph
+from celery.utils.imports import instantiate
 
 
 class Namespace(object):

celery/worker/autoreload.py

@@ -17,7 +17,7 @@ import time
 
 from collections import defaultdict
 
-from ..utils.threads import bgThread, Event
+from celery.utils.threads import bgThread, Event
 
 from .abstract import StartStopComponent
 

celery/worker/autoscale.py

@@ -21,7 +21,7 @@ import threading
 
 from time import sleep, time
 
-from ..utils.threads import bgThread
+from celery.utils.threads import bgThread
 
 from . import state
 from .abstract import StartStopComponent

celery/worker/buckets.py

@@ -26,8 +26,8 @@ from Queue import Queue, Empty
 
 from kombu.utils.limits import TokenBucket
 
-from ..utils import timeutils
-from ..utils.compat import zip_longest, chain_from_iterable
+from celery.utils import timeutils
+from celery.utils.compat import zip_longest, chain_from_iterable
 
 
 class RateLimitExceeded(Exception):

celery/worker/consumer.py

@@ -83,11 +83,11 @@ import warnings
 
 from kombu.utils.encoding import safe_repr
 
-from ..app import app_or_default
-from ..datastructures import AttributeDict
-from ..exceptions import InvalidTaskError
-from ..utils import timer2
-from ..utils.functional import noop
+from celery.app import app_or_default
+from celery.datastructures import AttributeDict
+from celery.exceptions import InvalidTaskError
+from celery.utils import timer2
+from celery.utils.functional import noop
 
 from . import state
 from .abstract import StartStopComponent

celery/worker/control.py

@@ -15,9 +15,9 @@ from datetime import datetime
 
 from kombu.utils.encoding import safe_repr
 
-from ..platforms import signals as _signals
-from ..utils import timeutils
-from ..utils.compat import UserDict
+from celery.platforms import signals as _signals
+from celery.utils import timeutils
+from celery.utils.compat import UserDict
 
 from . import state
 from .state import revoked

celery/worker/job.py

@@ -22,16 +22,16 @@ from datetime import datetime
 from kombu.utils import kwdict
 from kombu.utils.encoding import safe_repr, safe_str
 
-from .. import current_app
-from .. import exceptions
-from ..app import app_or_default
-from ..datastructures import ExceptionInfo
-from ..execute.trace import build_tracer, trace_task, report_internal_error
-from ..platforms import set_mp_process_title as setps
-from ..utils import fun_takes_kwargs
-from ..utils.functional import noop
-from ..utils.text import truncate
-from ..utils.timeutils import maybe_iso8601, timezone
+from celery import current_app
+from celery import exceptions
+from celery.app import app_or_default
+from celery.datastructures import ExceptionInfo
+from celery.execute.trace import build_tracer, trace_task, report_internal_error
+from celery.platforms import set_mp_process_title as setps
+from celery.utils import fun_takes_kwargs
+from celery.utils.functional import noop
+from celery.utils.text import truncate
+from celery.utils.timeutils import maybe_iso8601, timezone
 
 from . import state
 

celery/worker/mediator.py

@@ -22,8 +22,8 @@ import logging
 
 from Queue import Empty
 
-from ..app import app_or_default
-from ..utils.threads import bgThread
+from celery.app import app_or_default
+from celery.utils.threads import bgThread
 
 from .abstract import StartStopComponent
 

celery/worker/state.py

@@ -20,9 +20,9 @@ import shelve
 
 from collections import defaultdict
 
-from .. import __version__
-from ..datastructures import LimitedSet
-from ..utils import cached_property
+from celery import __version__
+from celery.datastructures import LimitedSet
+from celery.utils import cached_property
 
 #: Worker software/platform information.
 SOFTWARE_INFO = {"sw_ident": "celeryd",