Skip to content

Commit db47719

Browse files
kapilkd13manu-chroma
authored andcommitted
decoding byte data before sending to Subprocess and encoding \n before comparing
1 parent 369a853 commit db47719

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cwltool/sandboxjs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ def new_js_proc(force_docker_pull=False):
5757
# type: (bool) -> subprocess.Popen
5858

5959
res = resource_stream(__name__, 'cwlNodeEngine.js')
60-
nodecode = res.read()
60+
nodecode = res.read().decode('utf-8')
61+
6162
required_node_version, docker = (False,)*2
6263
nodejs = None
6364
trynodes = ("nodejs", "node")
@@ -238,7 +239,7 @@ def get_error(error_queue):
238239
no_more_error.release()
239240
output_thread.join()
240241
error_thread.join()
241-
if stdout_buf.getvalue().endswith("\n"):
242+
if stdout_buf.getvalue().endswith("\n".encode()):
242243
rselect = []
243244
no_more_output.release()
244245
no_more_error.release()

0 commit comments

Comments
 (0)