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

Python 3 doesn't have iteritems, use items (#4143)

Browse Source
This commit is contained in:
Adam J. Stewart 2017-05-05 16:21:15 -05:00 committed by GitHub
parent c3af901ac6
commit 6e23c31ad1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/boost/package.py
View File

@ -164,7 +164,7 @@ def determine_toolset(self, spec):
if spec.satisfies('@1.47:'): if spec.satisfies('@1.47:'):
toolsets['icpc'] += '-linux' toolsets['icpc'] += '-linux'
for cc, toolset in toolsets.iteritems(): for cc, toolset in toolsets.items():
if cc in self.compiler.cxx_names: if cc in self.compiler.cxx_names:
return toolset return toolset

6
var/spack/repos/builtin/packages/openfoam-com/package.py
View File

@ -140,7 +140,7 @@ def rewrite_environ_files(environ, **kwargs):
""" """
posix = kwargs.get('posix', None) posix = kwargs.get('posix', None)
if posix and isfile(posix): if posix and isfile(posix):
for k, v in environ.iteritems(): for k, v in environ.items():
filter_file( filter_file(
r'^(\s*export\s+%s)=.*$' % k, r'^(\s*export\s+%s)=.*$' % k,
r'\1=%s' % v, r'\1=%s' % v,
@ -148,7 +148,7 @@ def rewrite_environ_files(environ, **kwargs):
backup=False) backup=False)
cshell = kwargs.get('cshell', None) cshell = kwargs.get('cshell', None)
if cshell and isfile(cshell): if cshell and isfile(cshell):
for k, v in environ.iteritems(): for k, v in environ.items():
filter_file( filter_file(
r'^(\s*setenv\s+%s)\s+.*$' % k, r'^(\s*setenv\s+%s)\s+.*$' % k,
r'\1 %s' % v, r'\1 %s' % v,
@ -616,7 +616,7 @@ def configure(self, spec, prefix):
cshell=join_path('etc', 'prefs.csh')) cshell=join_path('etc', 'prefs.csh'))
# Adjust components to use SPACK variants # Adjust components to use SPACK variants
for component, subdict in self.etc_config.iteritems(): for component, subdict in self.etc_config.items():
write_environ( write_environ(
subdict, subdict,
posix=join_path('etc', 'config.sh', component), posix=join_path('etc', 'config.sh', component),

2
var/spack/repos/builtin/packages/openfoam-org/package.py
View File

@ -386,7 +386,7 @@ def configure(self, spec, prefix):
cshell=join_path('etc', 'prefs.csh')) cshell=join_path('etc', 'prefs.csh'))
# Adjust components to use SPACK variants # Adjust components to use SPACK variants
for component, subdict in self.etc_config.iteritems(): for component, subdict in self.etc_config.items():
write_environ( write_environ(
subdict, subdict,
posix=join_path('etc', 'config.sh', component), posix=join_path('etc', 'config.sh', component),