Remove deprecated use of Pathlib.Path as a context-mananger (#1854)

Author: mr-c

cwltool/main.py

@@ -645,12 +645,9 @@ def setup_schema(
     if custom_schema_callback is not None:
         custom_schema_callback()
     elif args.enable_ext:
-        with files("cwltool").joinpath("extensions.yml") as res:
-            ext10 = res.read_text("utf-8")
-        with files("cwltool").joinpath("extensions-v1.1.yml") as res:
-            ext11 = res.read_text("utf-8")
-        with files("cwltool").joinpath("extensions-v1.2.yml") as res:
-            ext12 = res.read_text("utf-8")
+        ext10 = files("cwltool").joinpath("extensions.yml").read_text("utf-8")
+        ext11 = files("cwltool").joinpath("extensions-v1.1.yml").read_text("utf-8")
+        ext12 = files("cwltool").joinpath("extensions-v1.2.yml").read_text("utf-8")
         use_custom_schema("v1.0", "http://commonwl.org/cwltool", ext10)
         use_custom_schema("v1.1", "http://commonwl.org/cwltool", ext11)
         use_custom_schema("v1.2", "http://commonwl.org/cwltool", ext12)

cwltool/process.py

@@ -194,19 +194,19 @@ def get_schema(
         version = ".".join(version.split(".")[:-1])
     for f in cwl_files:
         try:
-            with files("cwltool").joinpath(f"schemas/{version}/{f}") as res:
-                cache["https://w3id.org/cwl/" + f] = res.read_text("UTF-8")
+            res = files("cwltool").joinpath(f"schemas/{version}/{f}")
+            cache["https://w3id.org/cwl/" + f] = res.read_text("UTF-8")
         except OSError:
             pass
 
     for f in salad_files:
         try:
-            with files("cwltool").joinpath(
+            res = files("cwltool").joinpath(
                 f"schemas/{version}/salad/schema_salad/metaschema/{f}",
-            ) as res:
-                cache["https://w3id.org/cwl/salad/schema_salad/metaschema/" + f] = res.read_text(
-                    "UTF-8"
-                )
+            )
+            cache["https://w3id.org/cwl/salad/schema_salad/metaschema/" + f] = res.read_text(
+                "UTF-8"
+            )
         except OSError:
             pass
 

cwltool/validate_js.py

@@ -150,16 +150,16 @@ def jshint_js(
             "esversion": 5,
         }
 
-    with files("cwltool").joinpath("jshint/jshint.js") as res:
-        # NOTE: we need a global variable for lodash (which jshint depends on)
-        jshint_functions_text = "var global = this;" + res.read_text("utf-8")
-
-    with files("cwltool").joinpath("jshint/jshint_wrapper.js") as res2:
-        # NOTE: we need to assign to ob, as the expression {validateJS: validateJS} as an expression
-        # is interpreted as a block with a label `validateJS`
-        jshint_functions_text += (
-            "\n" + res2.read_text("utf-8") + "\nvar ob = {validateJS: validateJS}; ob"
-        )
+    res = files("cwltool").joinpath("jshint/jshint.js")
+    # NOTE: we need a global variable for lodash (which jshint depends on)
+    jshint_functions_text = "var global = this;" + res.read_text("utf-8")
+
+    res2 = files("cwltool").joinpath("jshint/jshint_wrapper.js")
+    # NOTE: we need to assign to ob, as the expression {validateJS: validateJS} as an expression
+    # is interpreted as a block with a label `validateJS`
+    jshint_functions_text += (
+        "\n" + res2.read_text("utf-8") + "\nvar ob = {validateJS: validateJS}; ob"
+    )
 
     returncode, stdout, stderr = exec_js_process(
         "validateJS(%s)" % json_dumps({"code": js_text, "options": options, "globals": globals}),