Fixes 2.5 compat for __package__. Closes #638

celery/bin/camqadm.py

@@ -6,7 +6,7 @@
 """
 from __future__ import absolute_import
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals.get("__package__") is None:
     __package__ = "celery.bin.celeryctl"
 
 import cmd

celery/bin/celery.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celery"
 
 import anyjson

celery/bin/celerybeat.py

@@ -25,7 +25,7 @@
 from __future__ import with_statement
 from __future__ import absolute_import
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celerybeat"
 
 import os

celery/bin/celeryctl.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celeryctl"
 
 from .celery import CeleryCommand as celeryctl, main  # noqa

celery/bin/celeryd.py

@@ -73,7 +73,7 @@
 """
 from __future__ import absolute_import
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celeryd"
 
 import sys

celery/bin/celeryd_detach.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celeryd_detach"
 
 import os

celery/bin/celeryd_multi.py

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

celery/bin/celeryev.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from __future__ import with_statement
 
-if __name__ == "__main__" and __package__ is None:
+if __name__ == "__main__" and globals().get("__package__") is None:
     __package__ = "celery.bin.celeryev"
 
 import os