types tweak

Author: mr-c

cwltool/expression.py

@@ -25,7 +25,7 @@ def jshead(engineConfig, rootvars):
 segment_re = re.compile(segments, flags=re.UNICODE)
 param_re = re.compile(r"\((%s)%s*\)$" % (seg_symbol, segments), flags=re.UNICODE)
 
-JSON = Union[Dict[Any, Any], List[Any], Text, int, int, float, bool, None]
+JSON = Union[Dict[Any, Any], List[Any], Text, int, long, float, bool, None]
 
 
 class SubstitutionError(Exception):

cwltool/sandboxjs.py

@@ -17,7 +17,7 @@ class JavascriptException(Exception):
 
 _logger = logging.getLogger("cwltool")
 
-JSON = Union[Dict[Text, Any], List[Any], Text, int, int, float, bool, None]
+JSON = Union[Dict[Text, Any], List[Any], Text, int, long, float, bool, None]
 
 localdata = threading.local()
 
@@ -104,7 +104,7 @@ def term():
     stdout_buf = BytesIO()
     stderr_buf = BytesIO()
 
-    completed = []  # type: List[Union[cStringIO.InputType, cStringIO.OutputType]]
+    completed = []  # type: List[BytesIO]
     while len(completed) < 3:
         rready, wready, _ = select.select([nodejs.stdout, nodejs.stderr], [nodejs.stdin], [])
         if nodejs.stdin in wready: