zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use string module to be compatible with python 3 (#248) (#10667)

Browse Source 
`string.find` is not part of Python 3 anymore.
This commit is contained in:
Tristan Carel 2019-03-13 02:34:47 +01:00 committed by Adam J. Stewart
parent 3d7164c13f
commit c3662492de
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/cmd/setup.py
View File

@ -6,7 +6,6 @@
import argparse import argparse
import copy import copy
import os import os
import string
import sys import sys
import llnl.util.tty as tty import llnl.util.tty as tty
@ -85,7 +84,7 @@ def cmdlist(str):
env_vars = sorted(list(env.keys())) env_vars = sorted(list(env.keys()))
for name in env_vars: for name in env_vars:
val = env[name] val = env[name]
if string.find(name, 'PATH') < 0: if name.find('PATH') < 0:
fout.write('env[%s] = %s\n' % (repr(name), repr(val))) fout.write('env[%s] = %s\n' % (repr(name), repr(val)))
else: else:
if name == 'SPACK_TRANSITIVE_INCLUDE_PATH': if name == 'SPACK_TRANSITIVE_INCLUDE_PATH':
@ -95,7 +94,7 @@ def cmdlist(str):
fout.write( fout.write(
'env[%s] = "%s".join(cmdlist("""\n' % (repr(name), sep)) 'env[%s] = "%s".join(cmdlist("""\n' % (repr(name), sep))
for part in string.split(val, sep): for part in val.split(sep):
fout.write(' %s\n' % part) fout.write(' %s\n' % part)
fout.write('"""))\n') fout.write('"""))\n')