ran 2to3 on SystemTests dir

ESMCI · Oct 10, 2017 · 4db671c · 4db671c
1 parent 4a4306e
commit 4db671c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/lib/CIME/SystemTests/nodefail.py b/scripts/lib/CIME/SystemTests/nodefail.py
@@ -49,7 +49,7 @@ def _restart_fake_phase(self):
         with open(fake_exe_file, "w") as fd:
             fd.write(fake_exe)
 
-        os.chmod(fake_exe_file, 0755)
+        os.chmod(fake_exe_file, 0o755)
 
         prev_run_exe = self._case.get_value("run_exe")
         env_mach_specific = self._case.get_env("mach_specific")

diff --git a/scripts/lib/CIME/SystemTests/system_tests_common.py b/scripts/lib/CIME/SystemTests/system_tests_common.py
@@ -343,12 +343,12 @@ def compare_env_run(self, expected=None):
         f1obj = EnvRun(self._caseroot, "env_run.xml", components=components)
         f2obj = EnvRun(self._caseroot, os.path.join(LOCKED_DIR, "env_run.orig.xml"), components=components)
         diffs = f1obj.compare_xml(f2obj)
-        for key in diffs.keys():
+        for key in list(diffs.keys()):
             if expected is not None and key in expected:
                 logging.warn("  Resetting {} for test".format(key))
                 f1obj.set_value(key, f2obj.get_value(key, resolved=False))
             else:
-                print("WARNING: Found difference in test {}: case: {} original value {}".format(key, diffs[key][0], diffs[key][1]))
+                print(("WARNING: Found difference in test {}: case: {} original value {}".format(key, diffs[key][0], diffs[key][1])))
                 return False
         return True
 
@@ -463,7 +463,7 @@ def build_phase(self, sharedlib_only=False, model_only=False):
                 f.write("#!/bin/bash\n")
                 f.write(self._script)
 
-            os.chmod(modelexe, 0755)
+            os.chmod(modelexe, 0o755)
 
             build.post_build(self._case, [])