Browse Source

PEP8ify + pyflakes

Ask Solem 13 years ago
parent
commit
88b6f1ca37

+ 0 - 1
celery/bin/celeryd.py

@@ -76,7 +76,6 @@ from __future__ import absolute_import
 if __name__ == "__main__" and __package__ is None:
     __package__ = "celery.bin.celeryd"
 
-import os
 import sys
 
 try:

+ 35 - 36
celery/concurrency/processes/forking.py

@@ -1,37 +1,36 @@
-#
-# Module for starting a process object using os.fork() or CreateProcess()
-#
-# multiprocessing/forking.py
-#
-# Copyright (c) 2006-2008, R Oudkerk
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. Neither the name of author nor the names of any contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
+"""
+    Module for starting a process object using os.fork() or CreateProcess()
+
+    multiprocessing/forking.py
+
+    Copyright (c) 2006-2008, R Oudkerk
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+    3. Neither the name of author nor the names of any contributors may be
+    used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+"""
 from __future__ import absolute_import
 
 import os
@@ -40,7 +39,7 @@ import sys
 from multiprocessing import current_process
 from multiprocessing import forking as _forking
 from multiprocessing import process
-from pickle import load, dump as _dump, HIGHEST_PROTOCOL
+from pickle import load, HIGHEST_PROTOCOL
 
 Popen = _forking.Popen
 
@@ -184,4 +183,4 @@ from celery.concurrency.processes.forking import main; main()"""
 
     _forking.Popen = Popen
 else:
-    from multiprocessing.forking import freeze_support
+    from multiprocessing.forking import freeze_support  # noqa

+ 2 - 0
celery/concurrency/processes/process.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from multiprocessing.process import Process as _Process
 
 from .forking import Popen

+ 0 - 1
celery/contrib/migrate.py

@@ -34,7 +34,6 @@ class State(object):
         return unicode(self.total_apx)
 
 
-
 def migrate_task(producer, body_, message,
         remove_props=["application_headers",
                       "content_type",