diff --git a/LCS/PyCommon/subprocess_utils.py b/LCS/PyCommon/subprocess_utils.py index 4d5e1fe5f9b878bca0b2c5fe564d7edee4b1baf3..f2a486bb58bc6d6f512d1ed4b73a5b9e79f4acd4 100644 --- a/LCS/PyCommon/subprocess_utils.py +++ b/LCS/PyCommon/subprocess_utils.py @@ -42,7 +42,7 @@ def communicate_returning_strings(proc, input=None): def check_output_returning_strings(*popenargs, timeout=None, **kwargs): """Helper function for subprocess.check_output(...) which changed from python2 to python3. This function waits for the subprocess to finish and returns the stdout and stderr as utf-8 strings, just like python2 did.""" - output = check_output(*popenargs, timeout=None, **kwargs) + output = check_output(*popenargs, timeout=timeout, **kwargs) if isinstance(output, tuple): return _convert_bytes_tuple_to_strings() if isinstance(output, bytes): diff --git a/QA/QA_Service/bin/qa_webservice b/QA/QA_Service/bin/qa_webservice index 00ad021ab868a639bd9be6d490631f4fc47e90a3..bda70603104b2bf7efda230b8b4104f01e4ac7a0 100755 --- a/QA/QA_Service/bin/qa_webservice +++ b/QA/QA_Service/bin/qa_webservice @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2012-2015 ASTRON (Netherlands Institute for Radio Astronomy) # P.O. Box 2, 7990 AA Dwingeloo, The Netherlands