summaryrefslogtreecommitdiffstats
path: root/test/LoadableModule.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
commit22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/LoadableModule.py
parent75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff)
downloadSCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible; the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'test/LoadableModule.py')
-rw-r--r--test/LoadableModule.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/LoadableModule.py b/test/LoadableModule.py
index 4c69dc0..6109359 100644
--- a/test/LoadableModule.py
+++ b/test/LoadableModule.py
@@ -25,7 +25,6 @@
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import os
-import string
import sys
import TestCmd
@@ -97,13 +96,13 @@ main(int argc, char *argv[])
foo1_name = {'darwin' : 'foo1'}.get(sys.platform[:6], dll_+'foo1'+_dll)
test.write('dlopenprog.c',
- string.replace(dlopenprog, '__foo1_name__', foo1_name))
+ dlopenprog.replace('__foo1_name__', foo1_name))
test.run(arguments = '.',
stderr=TestSCons.noisy_ar,
match=TestSCons.match_re_dotall)
-if string.find(sys.platform, 'darwin') != -1:
+if sys.platform.find('darwin') != -1:
test.run(program='/usr/bin/file',
arguments = "foo1",
match = TestCmd.match_re,