kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: ccx tools, more Python3 decode fixes

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-03-06 16:24:33 +01:00
committed by wmayer
parent dcae6d027e
commit 6ebc2423b5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/femtools/ccxtools.py
View File

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