Update mw.py

pull/632/head
Mr Chen 5 months ago
parent 7e55e1e29a
commit 325a113ac6
  1. 21
      web/core/mw.py

@ -50,13 +50,24 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True):
return sub.communicate()
data = sub.communicate()
success = data[0]
error = data[1]
# python3 fix 返回byte数据
if isinstance(data[0], bytes):
t1 = str(data[0], encoding='utf-8')
if isinstance(success, bytes):
# success = str(success, encoding='utf-8')
try:
success = success.decode('utf-8')
except Exception as e:
success = str(e)
if isinstance(data[1], bytes):
t2 = str(data[1], encoding='utf-8')
return (t1, t2)
if isinstance(error, bytes):
# error = str(error, encoding='utf-8')
try:
error = error.decode('utf-8')
except Exception as e:
error = str(e)
return (success, error)
def getTracebackInfo():

Loading…
Cancel
Save