From 55bc559f3382063f357557d4abf58e060e82966a Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 9 Nov 2021 13:27:53 +0100 Subject: [PATCH 1/2] SiStripDAQPopCon.py: improve readability of output See, e.g. [this log file](https://cmssdt.cern.ch/SDT/cgi-bin/logreader/slc7_amd64_gcc10/CMSSW_12_2_ASAN_X_2021-11-08-2300/unitTestLogs/CondTools/SiStrip#/17) --- CondTools/SiStrip/scripts/SiStripDAQPopCon.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CondTools/SiStrip/scripts/SiStripDAQPopCon.py b/CondTools/SiStrip/scripts/SiStripDAQPopCon.py index dc1222c1e533d..342b907369ceb 100755 --- a/CondTools/SiStrip/scripts/SiStripDAQPopCon.py +++ b/CondTools/SiStrip/scripts/SiStripDAQPopCon.py @@ -83,6 +83,8 @@ def runjob(args): pipe = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) atexit.register(partial(helper.kill_subproc_noexcept, pipe)) out = pipe.communicate()[0] + if isinstance(out, byte): + out = out.decode("utf8", "replace") logging.info('\n%s\n' % out) logging.info('@@@CMSSW job return code = %d@@@' % pipe.returncode) if pipe.returncode != 0: From 7f2bbb3b1a65f234c767714c665395822dc7a8ff Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 9 Nov 2021 18:30:24 +0100 Subject: [PATCH 2/2] Typo --- CondTools/SiStrip/scripts/SiStripDAQPopCon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CondTools/SiStrip/scripts/SiStripDAQPopCon.py b/CondTools/SiStrip/scripts/SiStripDAQPopCon.py index 342b907369ceb..2e7645d58ca56 100755 --- a/CondTools/SiStrip/scripts/SiStripDAQPopCon.py +++ b/CondTools/SiStrip/scripts/SiStripDAQPopCon.py @@ -83,7 +83,7 @@ def runjob(args): pipe = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) atexit.register(partial(helper.kill_subproc_noexcept, pipe)) out = pipe.communicate()[0] - if isinstance(out, byte): + if isinstance(out, bytes): out = out.decode("utf8", "replace") logging.info('\n%s\n' % out) logging.info('@@@CMSSW job return code = %d@@@' % pipe.returncode)