fix parenthesis

ESMCI · Oct 10, 2017 · a143b37 · a143b37
1 parent e36af5d
commit a143b37
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
diff --git a/scripts/Tools/list_acme_tests b/scripts/Tools/list_acme_tests
@@ -69,9 +69,9 @@ def list_tests(thing_to_list, categories):
             else:
                 expect(False, "Unrecognized thing to list '{}'".format(thing_to_list))
 
-    print(("Tested {} for test categories: {}".format(thing_to_list, ", ".join(categories))))
+    print("Tested {} for test categories: {}".format(thing_to_list, ", ".join(categories)))
     for item in sorted(things):
-        print((" ", item))
+        print(" ", item)
 
 ###############################################################################
 def _main_func(description):

diff --git a/scripts/Tools/simple_compare b/scripts/Tools/simple_compare
@@ -67,7 +67,7 @@ def _main_func(description):
     expect(success,
            "Diff between files {} and {}:\n{}".format(gold_file, compare_file, comments))
 
-    print(("Files {} and {} MATCH".format(gold_file, compare_file)))
+    print("Files {} and {} MATCH".format(gold_file, compare_file))
 
 ###############################################################################
 

diff --git a/scripts/lib/CIME/SystemTests/system_tests_common.py b/scripts/lib/CIME/SystemTests/system_tests_common.py
@@ -348,7 +348,7 @@ def compare_env_run(self, expected=None):
                 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
 

diff --git a/scripts/lib/CIME/XML/machines.py b/scripts/lib/CIME/XML/machines.py
@@ -300,13 +300,13 @@ def print_values(self):
             max_tasks_per_node = machine.find("MAX_TASKS_PER_NODE")
             MAX_MPITASKS_PER_NODE = machine.find("MAX_MPITASKS_PER_NODE")
 
-            print(( "  {} : {} ".format(name , desc.text)))
-            print(( "      os             ", os_.text))
-            print(( "      compilers      ",compilers.text))
+            print( "  {} : {} ".format(name , desc.text))
+            print( "      os             ", os_.text)
+            print( "      compilers      ",compilers.text)
             if MAX_MPITASKS_PER_NODE is not None:
-                print(( "      pes/node       ",MAX_MPITASKS_PER_NODE.text))
+                print("      pes/node       ",MAX_MPITASKS_PER_NODE.text)
             if max_tasks_per_node is not None:
-                print(( "      max_tasks/node ",max_tasks_per_node.text))
+                print("      max_tasks/node ",max_tasks_per_node.text)
 
     def return_all_values(self):
         # return a dictionary of machines
@@ -327,11 +327,10 @@ def return_all_values(self):
             if max_tasks_per_node is not None:
                 max_tasks_pn = max_tasks_per_node.text
 
-            mach_dict[name] = { 'description'    : desc.text, 
+            mach_dict[name] = { 'description'    : desc.text,
                                 'os'             : os_.text,
                                 'compilers'      : compilers.text,
                                 'pes/node'       : ppn,
                                 'max_tasks/node' : max_tasks_pn }
 
         return mach_dict
-
diff --git a/scripts/lib/CIME/XML/test_reporter.py b/scripts/lib/CIME/XML/test_reporter.py
@@ -105,6 +105,5 @@ def push2testdb(self):
         #
         # Print any messages from the post command
         #
-        print((f.read()))
-        print((f.code))
-
+        print(f.read())
+        print(f.code)
diff --git a/scripts/lib/CIME/XML/tests.py b/scripts/lib/CIME/XML/tests.py
@@ -50,4 +50,4 @@ def print_values(self, skip_infrastructure_tests=True):
                     continue
             name = one_test.get("NAME")
             desc = one_test.find("DESC").text
-            print(("{}: {}".format(name, desc)))
+            print("{}: {}".format(name, desc))
diff --git a/scripts/lib/CIME/bless_test_results.py b/scripts/lib/CIME/bless_test_results.py
@@ -15,7 +15,7 @@ def bless_namelists(test_name, report_only, force, baseline_name, baseline_root)
     # re-run create_test.
 
     # Update namelist files
-    print(("Test '{}' had namelist diff".format(test_name)))
+    print("Test '{}' had namelist diff".format(test_name))
     if (not report_only and
         (force or input("Update namelists (y/n)? ").upper() in ["Y", "YES"])):
         create_test_gen_args = " -g {} ".format(baseline_name if get_model() == "cesm" else " -g -b {} ".format(baseline_name))
@@ -97,11 +97,11 @@ def bless_test_results(baseline_name, baseline_root, test_root, compiler, test_i
 
             # Now, do the bless
             if not nl_bless and not hist_bless:
-                print(("Nothing to bless for test:", test_name, " overall status:", overall_result))
+                print("Nothing to bless for test:", test_name, " overall status:", overall_result)
             else:
 
                 print("###############################################################################")
-                print(("Blessing results for test:", test_name, "most recent result:", overall_result))
+                print("Blessing results for test:", test_name, "most recent result:", overall_result)
                 print("###############################################################################")
                 if not force:
                     time.sleep(2)

diff --git a/scripts/lib/CIME/check_lockedfiles.py b/scripts/lib/CIME/check_lockedfiles.py
@@ -113,8 +113,8 @@ def check_lockedfiles(case):
             if diffs:
                 logging.warn("File {} has been modified".format(lfile))
                 for key in list(diffs.keys()):
-                    print(("  found difference in {} : case {} locked {}"
-                          .format(key, repr(diffs[key][0]), repr(diffs[key][1]))))
+                    print("  found difference in {} : case {} locked {}"
+                          .format(key, repr(diffs[key][0]), repr(diffs[key][1])))
 
                 if objname == "env_mach_pes":
                     expect(False, "Invoke case.setup --reset ")

diff --git a/scripts/lib/CIME/compare_test_results.py b/scripts/lib/CIME/compare_test_results.py
@@ -152,7 +152,7 @@ def compare_test_results(baseline_name, baseline_root, test_root, compiler, test
                     brief_result += " {}".format(compare_comment)
                 brief_result += "\n"
 
-            print((brief_result,))
+            print(brief_result)
 
             append_status_cprnc_log(brief_result, logfile_name, test_dir)