Use resource_stream for validate_js

Author: ThomasHickman

cwltool/sandboxjs.py

@@ -10,7 +10,7 @@
 import sys
 from io import BytesIO
 from typing import Any, Dict, List, Mapping, Text, Tuple, Union
-from .utils import onWindows, get_data
+from .utils import onWindows
 from pkg_resources import resource_stream
 
 import six

cwltool/utils.py

@@ -175,21 +175,3 @@ def bytes2str_in_dicts(a):
 
     # simply return elements itself
     return a
-
-def get_data(filename):
-    # type: (Text) -> Text
-    filename = os.path.normpath(
-        filename)  # normalizing path depending on OS or else it will cause problem when joining path
-    filepath = None
-    try:
-        filepath = resource_filename(
-            Requirement.parse("cwltool"), filename)
-    except ResolutionError:
-        pass
-    if not filepath or not (os.path.isfile(filepath) or os.path.isdir(filepath)):
-        filepath = os.path.join(os.path.dirname(__file__), os.pardir, filename)
-
-    if not(os.path.isfile(filepath) or os.path.isdir(filepath)):
-        raise Exception("Resource %s not found." % filepath)
-
-    return filepath

cwltool/validate_js.py

@@ -20,7 +20,7 @@
 from .process import Process
 from .sandboxjs import (JavascriptException, code_fragment_to_js,
                         exec_js_process, execjs)
-from .utils import get_data
+from pkg_resources import resource_stream
 
 _logger = logging.getLogger("cwltool")
 
@@ -84,16 +84,14 @@ def jshint_js(js_text, globals=None, options=None):
             "esversion": 5
         }
 
-    linter_folder = get_data("cwltool/jshint")
-
-    with open(path.join(linter_folder, "jshint.js"), 'r', encoding='utf-8') as file:
+    with resource_stream(__name__, "jshint/jshint.js") as file:
         # NOTE: we need a global variable for lodash (which jshint depends on)
-        jshint_functions_text = "var global = this;" + file.read()
+        jshint_functions_text = "var global = this;" + file.read().decode('utf-8')
 
-    with open(path.join(linter_folder, "jshint_wrapper.js"), "r", encoding='utf-8') as file:
+    with resource_stream(__name__, "jshint/jshint_wrapper.js") as file:
         # 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" + file.read() + "\nvar ob = {validateJS: validateJS}; ob"
+        jshint_functions_text += "\n" + file.read().decode('utf-8') + "\nvar ob = {validateJS: validateJS}; ob"
 
     returncode, stdout, stderr = exec_js_process(
         "validateJS(%s)" % json.dumps({