Tests passing on Python 2.5

celery/bin/celery.py

@@ -482,9 +482,10 @@ class _RemoteControl(Command):
         except AttributeError:
             handler = self.call
 
-        replies = handler(method, *args[1:],
-                          timeout=timeout, destination=destination,
-                          callback=self.say_remote_command_reply)
+        # XXX Python 2.5 does not support X(*args, foo=1)
+        kwargs = {"timeout": timeout, "destination": destination,
+                  "callback": self.say_remote_command_reply}
+        replies = handler(method, *args[1:], **kwargs)
         if not replies:
             raise Error('No nodes replied within time constraint.',
                         status=EX_UNAVAILABLE)
@@ -564,7 +565,9 @@ class control(_RemoteControl):
     }
 
     def call(self, method, *args, **options):
-        return getattr(self.app.control, method)(*args, reply=True, **options)
+        # XXX Python 2.5 doesn't support X(*args, reply=True, **kwargs)
+        return getattr(self.app.control, method)(
+                *args, **dict(options, retry=True))
 
     def pool_grow(self, method, n=1, **kwargs):
         """[N=1]"""