summaryrefslogtreecommitdiff
path: root/site_scons/site_tools
diff options
context:
space:
mode:
Diffstat (limited to 'site_scons/site_tools')
-rw-r--r--site_scons/site_tools/default.py2
-rw-r--r--site_scons/site_tools/git.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/site_scons/site_tools/default.py b/site_scons/site_tools/default.py
index 9d02ab73b..08736f01a 100644
--- a/site_scons/site_tools/default.py
+++ b/site_scons/site_tools/default.py
@@ -61,7 +61,7 @@ def common_config(env):
"M5", # M5 configuration (e.g., path to kernels)
]
- for key,val in sorted(os.environ.iteritems()):
+ for key,val in sorted(os.environ.items()):
if key in use_vars or \
any([key.startswith(prefix) for prefix in use_prefixes]):
env['ENV'][key] = val
diff --git a/site_scons/site_tools/git.py b/site_scons/site_tools/git.py
index 1b40f28ef..e5b79129b 100644
--- a/site_scons/site_tools/git.py
+++ b/site_scons/site_tools/git.py
@@ -54,7 +54,7 @@ def install_style_hooks(env):
try:
gitdir = env.Dir(readCommand(
["git", "rev-parse", "--git-dir"]).strip("\n"))
- except Exception, e:
+ except Exception as e:
print("Warning: Failed to find git repo directory: %s" % e)
return