[cig-commits] r5979 - mc/3D/CitcomS/trunk/visual

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-02-07 16:14:46 -0800 (Wed, 07 Feb 2007)
New Revision: 5979

Modified:
   mc/3D/CitcomS/trunk/visual/execpaste.py
Log:
Removed the use of a new feature in python 2.4 ("substring" in "string")

Modified: mc/3D/CitcomS/trunk/visual/execpaste.py
===================================================================
--- mc/3D/CitcomS/trunk/visual/execpaste.py	2007-02-07 18:50:14 UTC (rev 5978)
+++ mc/3D/CitcomS/trunk/visual/execpaste.py	2007-02-08 00:14:46 UTC (rev 5979)
@@ -55,12 +55,18 @@
 
 ## expand datadir
 s = "%HOSTNAME"
-if s in datadir:
+try:
+    datadir.index(s)
+except: pass
+else:
     from socket import gethostname
     datadir = datadir.replace(s, gethostname())
 
 s = "%RANK"
-if s in datadir:
+try:
+    datadir.index(s)
+except: pass
+else:
     datadir = datadir.replace(s, rank)
 
 if datadir == "%DATADIR":