[cig-commits] r5328 - mc/3D/CitcomS/trunk/bin

[leif at geodynamics.org]

Author: leif
Date: 2006-11-17 17:29:12 -0800 (Fri, 17 Nov 2006)
New Revision: 5328

Modified:
   mc/3D/CitcomS/trunk/bin/pycitcoms.c
Log:
The function loadObject() has been moved from Pythia
to Merlin.


Modified: mc/3D/CitcomS/trunk/bin/pycitcoms.c
===================================================================
--- mc/3D/CitcomS/trunk/bin/pycitcoms.c	2006-11-18 01:25:41 UTC (rev 5327)
+++ mc/3D/CitcomS/trunk/bin/pycitcoms.c	2006-11-18 01:29:12 UTC (rev 5328)
@@ -41,7 +41,7 @@
 "path = path.split(':'); " \
 "path.extend(sys.path); " \
 "sys.path = path; " \
-"from pyre.util import loadObject; " \
+"from merlin import loadObject; " \
 "entry = loadObject(entry); " \
 "entry(sys.argv[3:], kwds={'requires': requires})"