Ask Solem 14 years ago
parent
commit
7ea3148b5c

+ 0 - 1
celery/backends/database.py

@@ -89,7 +89,6 @@ class DatabaseBackend(BaseDictBackend):
     def _forget(self, task_id):
         """Forget about result."""
         session = self.ResultSession()
-        expires = self.result_expires
         try:
             session.query(Task).filter(Task.task_id == task_id).delete()
             session.commit()

+ 4 - 4
celery/bin/celeryd_detach.py

@@ -84,10 +84,10 @@ class PartialOptionParser(OptionParser):
                 nargs = option.nargs
                 if len(rargs) < nargs:
                     if nargs == 1:
-                        self.error(_("%s option requires an argument") % opt)
+                        self.error("%s option requires an argument" % opt)
                     else:
-                        self.error(_("%s option requires %d arguments")
-                                % (opt, nargs))
+                        self.error("%s option requires %d arguments" % (
+                                    opt, nargs))
                 elif nargs == 1:
                     value = rargs.pop(0)
                 else:
@@ -95,7 +95,7 @@ class PartialOptionParser(OptionParser):
                     del rargs[0:nargs]
 
             elif had_explicit_value:
-                self.error(_("%s option does not take a value") % opt)
+                self.error("%s option does not take a value" % opt)
             else:
                 value = None
             option.process(opt, value, values, self)

+ 1 - 1
celery/bin/celeryd_multi.py

@@ -364,7 +364,7 @@ def multi_args(p, cmd="celeryd", append="", prefix="", suffix=""):
         except ValueError:
             pass
         else:
-            names = map(str, range(1, int(names[0]) + 1))
+            names = map(str, range(1, noderange + 1))
             prefix = "celery"
     cmd = options.pop("--cmd", cmd)
     append = options.pop("--append", append)

+ 1 - 1
celery/concurrency/processes/__init__.py

@@ -92,7 +92,7 @@ class TaskPool(object):
             if timeout and time() - time_start > timeout:
                 print("TIMED OUT i==%r" % (i, ))
                 break
-            x = results[i] = self._pool.apply_async(pingback,
+            results[i] = self._pool.apply_async(pingback,
                                                 args=(i, ),
                                                 callback=callback)
             sleep(0.1)

+ 1 - 2
celery/platforms.py

@@ -3,7 +3,6 @@ import sys
 import pwd
 import grp
 import errno
-import atexit
 import signal
 try:
     from setproctitle import setproctitle as _setproctitle
@@ -75,7 +74,7 @@ class PIDFile(object):
         try:
             return int(line)
         except ValueError:
-            raise ValueError("PID file %r contents invalid." % path)
+            raise ValueError("PID file %r contents invalid." % self.path)
 
     def remove(self):
         try:

+ 1 - 3
celery/task/builtins.py

@@ -1,9 +1,7 @@
-from datetime import timedelta
-
 from celery import conf
 from celery.schedules import crontab
 from celery.serialization import pickle
-from celery.task.base import Task, PeriodicTask
+from celery.task.base import Task
 from celery.task.sets import TaskSet
 
 

+ 0 - 1
celery/tests/test_timer2.py

@@ -27,7 +27,6 @@ class test_Entry(unittest.TestCase):
 class test_Schedule(unittest.TestCase):
 
     def test_handle_error(self):
-        import time
         from datetime import datetime
         mktime = timer2.mktime
         scratch = [None]

+ 3 - 1
contrib/release/doc4allmods

@@ -2,7 +2,9 @@
 
 PACKAGE="$1"
 SKIP_PACKAGES="$PACKAGE tests management urls"
-SKIP_FILES="celery.bin.rst celery.contrib.rst
+SKIP_FILES="celery.bin.rst
+            celery.bin.celeryd_detach.rst
+            celery.contrib.rst
             celery.contrib.batches.rst
             celery.task.schedules.rst
             celery.models.rst