Rename celery.platform -> celery.platforms, so it doesn't collide with the built-in 'platform' module.

celery/apps/beat.py

@@ -4,7 +4,7 @@ import traceback
 
 from celery import __version__
 from celery import beat
-from celery import platform
+from celery import platforms
 from celery.app import app_or_default
 from celery.utils import LOG_LEVELS
 
@@ -80,7 +80,7 @@ class Beat(object):
 
     def set_process_title(self):
         arg_start = "manage" in sys.argv[0] and 2 or 1
-        platform.set_process_title("celerybeat",
+        platforms.set_process_title("celerybeat",
                                info=" ".join(sys.argv[arg_start:]))
 
     def install_sync_handler(self, beat):
@@ -91,8 +91,8 @@ class Beat(object):
             beat.sync()
             raise SystemExit()
 
-        platform.install_signal_handler("SIGTERM", _sync)
-        platform.install_signal_handler("SIGINT", _sync)
+        platforms.install_signal_handler("SIGTERM", _sync)
+        platforms.install_signal_handler("SIGINT", _sync)
 
 
 def run_celerybeat(*args, **kwargs):

celery/apps/worker.py

@@ -6,7 +6,7 @@ import socket
 import sys
 
 from celery import __version__
-from celery import platform
+from celery import platforms
 from celery import signals
 from celery.app import app_or_default
 from celery.exceptions import ImproperlyConfigured
@@ -215,7 +215,7 @@ def install_worker_int_handler(worker):
             worker.stop()
         raise SystemExit()
 
-    platform.install_signal_handler("SIGINT", _stop)
+    platforms.install_signal_handler("SIGINT", _stop)
 
 
 def install_worker_int_again_handler(worker):
@@ -228,7 +228,7 @@ def install_worker_int_again_handler(worker):
             worker.terminate()
         raise SystemExit()
 
-    platform.install_signal_handler("SIGINT", _stop)
+    platforms.install_signal_handler("SIGINT", _stop)
 
 
 def install_worker_term_handler(worker):
@@ -241,7 +241,7 @@ def install_worker_term_handler(worker):
             worker.stop()
         raise SystemExit()
 
-    platform.install_signal_handler("SIGTERM", _stop)
+    platforms.install_signal_handler("SIGTERM", _stop)
 
 
 def install_worker_restart_handler(worker):
@@ -253,7 +253,7 @@ def install_worker_restart_handler(worker):
         worker.stop()
         os.execv(sys.executable, [sys.executable] + sys.argv)
 
-    platform.install_signal_handler("SIGHUP", restart_worker_sig_handler)
+    platforms.install_signal_handler("SIGHUP", restart_worker_sig_handler)
 
 
 def install_HUP_not_supported_handler(worker):
@@ -262,14 +262,14 @@ def install_HUP_not_supported_handler(worker):
         worker.logger.error("SIGHUP not supported: "
             "Restarting with HUP is unstable on this platform!")
 
-    platform.install_signal_handler("SIGHUP", warn_on_HUP_handler)
+    platforms.install_signal_handler("SIGHUP", warn_on_HUP_handler)
 
 
 def set_process_status(info):
     arg_start = "manage" in sys.argv[0] and 2 or 1
     if sys.argv[arg_start:]:
         info = "%s (%s)" % (info, " ".join(sys.argv[arg_start:]))
-    return platform.set_mp_process_title("celeryd", info=info)
+    return platforms.set_mp_process_title("celeryd", info=info)
 
 
 def run_worker(*args, **kwargs):

celery/beat.py

@@ -10,7 +10,7 @@ import multiprocessing
 from datetime import datetime
 from UserDict import UserDict
 
-from celery import platform
+from celery import platforms
 from celery.app import app_or_default
 from celery.log import SilenceRepeated
 from celery.schedules import maybe_schedule
@@ -295,7 +295,7 @@ class Service(object):
                     humanize_seconds(self.scheduler.max_interval)))
 
         if embedded_process:
-            platform.set_process_title("celerybeat")
+            platforms.set_process_title("celerybeat")
 
         try:
             try:
@@ -356,7 +356,7 @@ class _Process(multiprocessing.Process):
         self.name = "Beat"
 
     def run(self):
-        platform.reset_signal("SIGTERM")
+        platforms.reset_signal("SIGTERM")
         self.service.start(embedded_process=True)
 
     def stop(self):

celery/tests/test_bin/test_celerybeat.py

@@ -3,7 +3,7 @@ import sys
 import unittest2 as unittest
 
 from celery import beat
-from celery import platform
+from celery import platforms
 from celery.app import app_or_default
 from celery.bin import celerybeat as celerybeat_bin
 from celery.apps import beat as beatapp
@@ -67,12 +67,13 @@ class test_Beat(unittest.TestCase):
         def i(sig, handler):
             handlers[sig] = handler
 
-        p, platform.install_signal_handler = platform.install_signal_handler, i
+        p, platforms.install_signal_handler = \
+                platforms.install_signal_handler, i
         try:
             fun(*args, **kwargs)
             return handlers
         finally:
-            platform.install_signal_handler = p
+            platforms.install_signal_handler = p
 
     def test_install_sync_handler(self):
         b = beatapp.Beat()

celery/tests/test_bin/test_celeryd.py

@@ -7,7 +7,7 @@ from multiprocessing import get_logger, current_process
 from StringIO import StringIO
 
 from celery import Celery
-from celery import platform
+from celery import platforms
 from celery import signals
 from celery.app import app_or_default
 from celery.apps import worker as cd
@@ -72,8 +72,8 @@ class test_Worker(unittest.TestCase):
         def i(sig, handler):
             handlers[sig] = handler
 
-        p = platform.install_signal_handler
-        platform.install_signal_handler = i
+        p = platforms.install_signal_handler
+        platforms.install_signal_handler = i
         try:
             w = self.Worker()
             w._isatty = False
@@ -89,7 +89,7 @@ class test_Worker(unittest.TestCase):
                 self.assertIn(sig, handlers)
             self.assertNotIn("SIGHUP", handlers)
         finally:
-            platform.install_signal_handler = p
+            platforms.install_signal_handler = p
 
     @disable_stdouts
     def test_startup_info(self):
@@ -230,12 +230,13 @@ class test_signal_handlers(unittest.TestCase):
         def i(sig, handler):
             handlers[sig] = handler
 
-        p, platform.install_signal_handler = platform.install_signal_handler, i
+        p, platforms.install_signal_handler = \
+                platforms.install_signal_handler, i
         try:
             fun(*args, **kwargs)
             return handlers
         finally:
-            platform.install_signal_handler = p
+            platforms.install_signal_handler = p
 
     @disable_stdouts
     def test_worker_int_handler(self):
@@ -246,14 +247,14 @@ class test_signal_handlers(unittest.TestCase):
         def i(sig, handler):
             next_handlers[sig] = handler
 
-        p = platform.install_signal_handler
-        platform.install_signal_handler = i
+        p = platforms.install_signal_handler
+        platforms.install_signal_handler = i
         try:
             self.assertRaises(SystemExit, handlers["SIGINT"],
                               "SIGINT", object())
             self.assertTrue(worker.stopped)
         finally:
-            platform.install_signal_handler = p
+            platforms.install_signal_handler = p
 
         self.assertRaises(SystemExit, next_handlers["SIGINT"],
                           "SIGINT", object())

celery/worker/__init__.py

@@ -10,7 +10,7 @@ from multiprocessing.util import Finalize
 
 from celery import beat
 from celery import registry
-from celery import platform
+from celery import platforms
 from celery import signals
 from celery.app import app_or_default
 from celery.log import SilenceRepeated
@@ -37,9 +37,9 @@ def process_initializer(app):
 
     """
     app = app_or_default(app)
-    map(platform.reset_signal, WORKER_SIGRESET)
-    map(platform.ignore_signal, WORKER_SIGIGNORE)
-    platform.set_mp_process_title("celeryd")
+    map(platforms.reset_signal, WORKER_SIGRESET)
+    map(platforms.ignore_signal, WORKER_SIGIGNORE)
+    platforms.set_mp_process_title("celeryd")
 
     # This is for windows and other platforms not supporting
     # fork(). Note that init_worker makes sure it's only

celery/worker/job.py

@@ -6,7 +6,7 @@ import warnings
 
 from datetime import datetime
 
-from celery import platform
+from celery import platforms
 from celery.app import app_or_default
 from celery.concurrency.processes.pool import WorkerLostError
 from celery.datastructures import ExceptionInfo
@@ -139,11 +139,11 @@ def execute_and_trace(task_name, *args, **kwargs):
         >>> WorkerTaskTrace(task_name, *args, **kwargs).execute_safe()
 
     """
-    platform.set_mp_process_title("celeryd", info=task_name)
+    platforms.set_mp_process_title("celeryd", info=task_name)
     try:
         return WorkerTaskTrace(task_name, *args, **kwargs).execute_safe()
     finally:
-        platform.set_mp_process_title("celeryd")
+        platforms.set_mp_process_title("celeryd")
 
 
 class TaskRequest(object):

docs/internals/reference/celery.platform.rst

@@ -1,11 +0,0 @@
-=====================================
- Platform Specific - celery.platform
-=====================================
-
-.. contents::
-    :local:
-.. currentmodule:: celery.platform
-
-.. automodule:: celery.platform
-    :members:
-    :undoc-members:

docs/internals/reference/celery.platforms.rst

@@ -0,0 +1,11 @@
+======================================
+ Platform Specific - celery.platforms
+======================================
+
+.. contents::
+    :local:
+.. currentmodule:: celery.platforms
+
+.. automodule:: celery.platforms
+    :members:
+    :undoc-members:

docs/internals/reference/index.rst

@@ -53,4 +53,4 @@
     celery.utils.dispatch
     celery.utils.dispatch.signal
     celery.utils.dispatch.saferef
-    celery.platform
+    celery.platforms