summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-05-05 16:21:15 -0500
committerGitHub <noreply@github.com>2017-05-05 16:21:15 -0500
commit6e23c31ad1bbfa985b8aa1a250778da9abefa45d (patch)
tree8ebf6bdf38b368c29980fa92a03967e0bd28bb21
parentc3af901ac613805544c228a048a383bf92d4d11d (diff)
downloadspack-6e23c31ad1bbfa985b8aa1a250778da9abefa45d.tar.gz
spack-6e23c31ad1bbfa985b8aa1a250778da9abefa45d.tar.bz2
spack-6e23c31ad1bbfa985b8aa1a250778da9abefa45d.tar.xz
spack-6e23c31ad1bbfa985b8aa1a250778da9abefa45d.zip
Python 3 doesn't have iteritems, use items (#4143)
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py2
-rw-r--r--var/spack/repos/builtin/packages/openfoam-com/package.py6
-rw-r--r--var/spack/repos/builtin/packages/openfoam-org/package.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index d4c772ed03..c0aa582d72 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -164,7 +164,7 @@ class Boost(Package):
if spec.satisfies('@1.47:'):
toolsets['icpc'] += '-linux'
- for cc, toolset in toolsets.iteritems():
+ for cc, toolset in toolsets.items():
if cc in self.compiler.cxx_names:
return toolset
diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py
index fcd33eadcb..15c4f8fdd4 100644
--- a/var/spack/repos/builtin/packages/openfoam-com/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-com/package.py
@@ -140,7 +140,7 @@ def rewrite_environ_files(environ, **kwargs):
"""
posix = kwargs.get('posix', None)
if posix and isfile(posix):
- for k, v in environ.iteritems():
+ for k, v in environ.items():
filter_file(
r'^(\s*export\s+%s)=.*$' % k,
r'\1=%s' % v,
@@ -148,7 +148,7 @@ def rewrite_environ_files(environ, **kwargs):
backup=False)
cshell = kwargs.get('cshell', None)
if cshell and isfile(cshell):
- for k, v in environ.iteritems():
+ for k, v in environ.items():
filter_file(
r'^(\s*setenv\s+%s)\s+.*$' % k,
r'\1 %s' % v,
@@ -616,7 +616,7 @@ echo WM_PROJECT_DIR = $WM_PROJECT_DIR
cshell=join_path('etc', 'prefs.csh'))
# Adjust components to use SPACK variants
- for component, subdict in self.etc_config.iteritems():
+ for component, subdict in self.etc_config.items():
write_environ(
subdict,
posix=join_path('etc', 'config.sh', component),
diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py
index 19ffd40507..53be5f6337 100644
--- a/var/spack/repos/builtin/packages/openfoam-org/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-org/package.py
@@ -386,7 +386,7 @@ echo WM_PROJECT_DIR = $WM_PROJECT_DIR
cshell=join_path('etc', 'prefs.csh'))
# Adjust components to use SPACK variants
- for component, subdict in self.etc_config.iteritems():
+ for component, subdict in self.etc_config.items():
write_environ(
subdict,
posix=join_path('etc', 'config.sh', component),