diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
| commit | 22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch) | |
| tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/QT/Tool.py | |
| parent | 75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff) | |
| download | SCons-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/QT/Tool.py')
| -rw-r--r-- | test/QT/Tool.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/QT/Tool.py b/test/QT/Tool.py index 86eb4ca..63fb113 100644 --- a/test/QT/Tool.py +++ b/test/QT/Tool.py @@ -90,7 +90,7 @@ def CheckForQt(context): "/usr/pkg/qt3" # pkgsrc (NetBSD) ] - if os.environ.has_key('QTDIR'): + if 'QTDIR' in os.environ: potential_qt_dirs.insert(0, os.environ[ 'QTDIR' ]) if env[ 'qt_directory' ] != "/": @@ -125,10 +125,8 @@ def CheckForQt(context): return 0 def AttemptLinkWithVariables(context, variables, code, extension, prefix): - return DoWithVariables(variables, - prefix, - lambda c=context, code=code, e=extension: - c.TryLink(code, e)) + return DoWithVariables(variables, prefix, + lambda: context.TryLink(code, extension)) env = Environment(CPPPATH=['.'], LIBPATH=['.'], LIBS=[]) |