Don't use relative imports in main modules

celery/bin/camqadm.py

@@ -6,9 +6,6 @@
 """
 from __future__ import absolute_import
 
-if __name__ == "__main__" and globals.get("__package__") is None:
-    __package__ = "celery.bin.celeryctl"
-
 import cmd
 import sys
 import shlex
@@ -21,7 +18,7 @@ from amqplib import client_0_8 as amqp
 from celery.app import app_or_default
 from celery.utils.functional import padlist
 
-from .base import Command
+from celery.bin.base import Command
 
 # Valid string -> bool coercions.
 BOOLS = {"1": True, "0": False,

celery/bin/celery.py

@@ -2,9 +2,6 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celery"
-
 import anyjson
 import sys
 
@@ -21,7 +18,7 @@ from celery.utils.imports import symbol_by_name
 from celery.utils.text import pluralize
 from celery.utils.timeutils import maybe_iso8601
 
-from .base import Command as BaseCommand
+from celery.bin.base import Command as BaseCommand
 
 HELP = """
 Type '%(prog_name)s <command> --help' for help using

celery/bin/celerybeat.py

@@ -25,16 +25,13 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celerybeat"
-
 import os
 
 from functools import partial
 
 from celery.platforms import detached
 
-from .base import Command, Option, daemon_options
+from celery.bin.base import Command, Option, daemon_options
 
 
 class BeatCommand(Command):

celery/bin/celeryctl.py

@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from __future__ import with_statement
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celeryctl"
-
-from .celery import CeleryCommand as celeryctl, main  # noqa
+from celery.bin.celery import (  # noqa
+    CeleryCommand as celeryctl, Command, main,
+)
 
 if __name__ == "__main__":  # pragma: no cover
     main()

celery/bin/celeryd_detach.py

@@ -2,9 +2,6 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celeryd_detach"
-
 import os
 import sys
 
@@ -14,7 +11,7 @@ from celery import __version__
 from celery.platforms import detached
 from celery.utils.log import get_logger
 
-from .base import daemon_options, Option
+from celery.bin.base import daemon_options, Option
 
 logger = get_logger(__name__)
 

celery/bin/celeryd_multi.py

@@ -88,9 +88,6 @@ Examples
 """
 from __future__ import absolute_import
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celeryd_multi"
-
 import errno
 import os
 import signal

celery/bin/celeryev.py

@@ -2,17 +2,13 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and globals().get("__package__") is None:
-    __package__ = "celery.bin.celeryev"
-
 import os
 import sys
 
 from functools import partial
 
 from celery.platforms import detached, set_process_title, strargv
-
-from .base import Command, Option, daemon_options
+from celery.bin.base import Command, Option, daemon_options
 
 
 class EvCommand(Command):