diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch) | |
| tree | 79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/Scanner/Prog.py | |
| parent | 7f642861f3946d4241cbd668de258293ba92767a (diff) | |
| parent | 340d57481935334465037d97c0db1555b70c0eb1 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/Scanner/Prog.py')
| -rw-r--r-- | engine/SCons/Scanner/Prog.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engine/SCons/Scanner/Prog.py b/engine/SCons/Scanner/Prog.py index 395d39f..97f25b3 100644 --- a/engine/SCons/Scanner/Prog.py +++ b/engine/SCons/Scanner/Prog.py @@ -21,9 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/Prog.py 4720 2010/03/24 03:14:11 jars" - -import string +__revision__ = "src/engine/SCons/Scanner/Prog.py 5023 2010/06/14 22:05:46 scons" import SCons.Node import SCons.Node.FS @@ -37,7 +35,7 @@ def ProgramScanner(**kw): """Return a prototype Scanner instance for scanning executable files for static-lib dependencies""" kw['path_function'] = SCons.Scanner.FindPathDirs('LIBPATH') - ps = apply(SCons.Scanner.Base, [scan, "ProgramScanner"], kw) + ps = SCons.Scanner.Base(scan, "ProgramScanner", **kw) return ps def scan(node, env, libpath = ()): @@ -53,7 +51,7 @@ def scan(node, env, libpath = ()): # There are no LIBS in this environment, so just return a null list: return [] if SCons.Util.is_String(libs): - libs = string.split(libs) + libs = libs.split() else: libs = SCons.Util.flatten(libs) |