From 299e9d2d2ddf7b9a7e25f375069ff237c97d8834 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 6 Mar 2019 16:24:33 +0100 Subject: [PATCH] FEM: ccx tools, more Python3 decode fixes --- src/Mod/Fem/femtools/ccxtools.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Mod/Fem/femtools/ccxtools.py b/src/Mod/Fem/femtools/ccxtools.py index 014b9a7b48..973485fe9b 100644 --- a/src/Mod/Fem/femtools/ccxtools.py +++ b/src/Mod/Fem/femtools/ccxtools.py @@ -630,6 +630,9 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False, env=_env) self.ccx_stdout, self.ccx_stderr = p.communicate() + if sys.version_info.major >= 3: + self.ccx_stdout = self.ccx_stdout.decode() + self.ccx_stderr = self.ccx_stderr.decode() os.putenv('OMP_NUM_THREADS', ont_backup) QtCore.QDir.setCurrent(cwd) return p.returncode @@ -653,6 +656,7 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject): ccx_stdout, ccx_stderr = p.communicate() if sys.version_info.major >= 3: ccx_stdout = ccx_stdout.decode() + ccx_stderr = ccx_stderr.decode() m = re.search(r"(\d+).(\d+)", ccx_stdout) return (int(m.group(1)), int(m.group(2)))