[Rivet-svn] r2882 - trunk/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Jan 20 13:59:45 2011
New Revision: 2882

Log:
try to make Hudson happy (python 2.4)

Modified:
   trunk/bin/rivet

Modified: trunk/bin/rivet
==============================================================================
--- trunk/bin/rivet	Wed Jan 19 14:07:48 2011	(r2881)
+++ trunk/bin/rivet	Thu Jan 20 13:59:45 2011	(r2882)
@@ -404,7 +404,9 @@
     rtn = min(a, b)
     if rtn is not None:
         return rtn
-    return a if a is not None else b
+    if a is not None:
+        return a
+    return b
 
 
 ## Set up an event timeout handler