celery/bin/celeryd.py

Fix weird __package__ bug for when execv is used

celery/bin/celeryd.py

@@ -73,7 +73,7 @@
 """
 from __future__ import absolute_import
 
-if __name__ == "__main__" and __package__ is None:
+if "__main__" and __package__ is None:
     __package__ = "celery.bin.celeryd"
 
 import sys
@@ -83,7 +83,7 @@ try:
 except ImportError:  # pragma: no cover
     freeze_support = lambda: True  # noqa
 
-from .base import Command, Option
+from celery.bin.base import Command, Option
 
 
 class WorkerCommand(Command):
@@ -95,7 +95,7 @@ class WorkerCommand(Command):
         kwargs.pop("app", None)
         # Pools like eventlet/gevent needs to patch libs as early
         # as possible.
-        from .. import concurrency
+        from celery import concurrency
         kwargs["pool"] = concurrency.get_implementation(
                     kwargs.get("pool") or self.app.conf.CELERYD_POOL)
         return self.app.Worker(**kwargs).run()