Replace 'a if p else b' with 'p and a or b' for Python 2.4 compatibility.

celery/registry.py

@@ -25,7 +25,7 @@ class TaskRegistry(UserDict):
         not an instance.
         """
 
-        task = task() if inspect.isclass(task) else task
+        task = inspect.isclass(task) and task() or task
         name = task.name
         self.data[name] = task
 

celery/task/rest.py

@@ -62,10 +62,10 @@ class URL(object):
         query = urlencode(self._utf8dict(self.query.items()))
         components = ["%s://" % u.scheme,
                       "%s" % u.netloc,
-                      "%s" % u.path if u.path else "/",
-                      ";%s" % u.params if u.params else None,
-                      "?%s" % query if query else None,
-                      "#%s" % u.fragment if u.fragment else None]
+                      u.path and "%s" % u.path or "/",
+                      u.params and ";%s" % u.params or None,
+                      query and "?%s" % query or None,
+                      u.fragment and "#%s" % u.fragment or None]
         return "".join(filter(None, components))
 
     def __repr__(self):

celery/task/strategy.py

@@ -40,7 +40,7 @@ def even_time_distribution(task, size, time_window, iterable, **apply_kwargs):
     try:
         for bucket_count, bucket in enumerate(buckets):
             # Skew the countdown for items in this bucket by one.
-            seconds_eta = (60 * bucket_count if bucket_count else None)
+            seconds_eta = (bucket_count and 60 * bucket_count or None)
 
             for args, kwargs in bucket:
                 task.apply_async(args=args, kwargs=kwargs,

celery/tests/utils.py

@@ -32,7 +32,7 @@ def skip_if(predicate, reason):
     """Skip test if predicate is ``True``."""
 
     def _inner(fun):
-        return skip(reason)(fun) if predicate else fun
+        return predicate and skip(reason)(fun) or fun
 
     return _inner
 

celery/worker/buckets.py

@@ -216,7 +216,7 @@ class TokenBucketQueue(object):
         Also see :meth:`Queue.Queue.put`.
 
         """
-        put = self.queue.put if block else self.queue.put_nowait
+        put = block and self.queue.put or self.queue.put_nowait
         put(item)
 
     def put_nowait(self, item):
@@ -239,7 +239,7 @@ class TokenBucketQueue(object):
         Also see :meth:`Queue.Queue.get`.
 
         """
-        get = self.queue.get if block else self.queue.get_nowait
+        get = block and self.queue.get or self.queue.get_nowait
 
         if not self.can_consume(1):
             raise RateLimitExceeded

celery/worker/scheduler.py

@@ -23,7 +23,7 @@ class Scheduler(object):
             This callback takes no arguments.
 
         """
-        eta = time.mktime(eta.timetuple()) if eta else time.time()
+        eta = eta and time.mktime(eta.timetuple()) or time.time()
         heapq.heappush(self._queue, (eta, priority, item, callback))
 
     def __iter__(self):