use Python context manager idiom when reading and writing files

Newer versions of Pylint suggest this.

diff --git a/tclpkg/gv/demo/modgraph.py b/tclpkg/gv/demo/modgraph.py
index 311d50da58860ce02a5cb37977b2a43d23726ee3..40f9167edffffdd078fc119362ab30d28d566fdb 100755 (executable)
--- a/tclpkg/gv/demo/modgraph.py
+++ b/tclpkg/gv/demo/modgraph.py
@@ -9,7 +9,8 @@ author: Michael Hohn <mhhohn@lbl.gov>
 
 import gv # pylint: disable=import-error
 
-modules = open("/proc/modules", "rt", encoding="utf-8").readlines()
+with open("/proc/modules", "rt", encoding="utf-8") as mod:
+  modules = mod.readlines()
 
 G = gv.digraph("G")
 N = gv.protonode(G)

diff --git a/tests/regression_tests/shapes/shapes.py b/tests/regression_tests/shapes/shapes.py
index 3e957874335a104f63383f211ac12d8a27c8b7de..154858ce4734201baa860887ecafb1557efff24c 100644 (file)
--- a/tests/regression_tests/shapes/shapes.py
+++ b/tests/regression_tests/shapes/shapes.py
@@ -102,16 +102,15 @@ def generate_shape_graph(shape, output_type):
     # Remove the number in "Generated by graphviz version <number>"
     # to able to compare the output to the reference. This version
     # number is different for every Graphviz compilation.
-    file = open(output_file, "rt", encoding="utf-8")
-    lines = file.readlines()
-    file.close()
+    with open(output_file, "rt", encoding="utf-8") as file:
+      lines = file.readlines()
 
-    file = open(output_file, "wt", encoding="utf-8")
-    for line in lines:
-      if "<!-- Generated by graphviz version " in line:
-        file.write("<!-- Generated by graphviz version\n")
-      else:
-        file.write(line)
+    with open(output_file, "wt", encoding="utf-8") as file:
+      for line in lines:
+        if "<!-- Generated by graphviz version " in line:
+          file.write("<!-- Generated by graphviz version\n")
+        else:
+          file.write(line)
 
 failures = 0
 for s in shapes:

diff --git a/tests/regression_tests/shapes/test_shapes.py b/tests/regression_tests/shapes/test_shapes.py
index 4bced1edb8de2240da2a4d130d80c4fef10c113f..53f2f8abff8048424bbbb25bdffded6967fb4b82 100644 (file)
--- a/tests/regression_tests/shapes/test_shapes.py
+++ b/tests/regression_tests/shapes/test_shapes.py
@@ -104,16 +104,15 @@ def generate_shape_graph(shape, output_type):
     # Remove the number in "Generated by graphviz version <number>"
     # to able to compare the output to the reference. This version
     # number is different for every Graphviz compilation.
-    file = open(output_file, "rt", encoding="utf-8")
-    lines = file.readlines()
-    file.close()
+    with open(output_file, "rt", encoding="utf-8") as file:
+      lines = file.readlines()
 
-    file = open(output_file, "wt", encoding="utf-8")
-    for line in lines:
-      if "<!-- Generated by graphviz version " in line:
-        file.write("<!-- Generated by graphviz version\n")
-      else:
-        file.write(line)
+    with open(output_file, "wt", encoding="utf-8") as file:
+      for line in lines:
+        if "<!-- Generated by graphviz version " in line:
+          file.write("<!-- Generated by graphviz version\n")
+        else:
+          file.write(line)
 
 @pytest.mark.parametrize(
     "shape,output_type", [(shape, output_type) for shape in shapes