SW-658: merge fixes

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):

QA/QA_Service/bin/qa_webservice

-#!/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