Salome HOME
projects
/
tools
/
sat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
255cde7
)
sat #18855 : decodage de bytes en python3
author
crouzet
<nicolas.crouzet@cea.fr>
Mon, 25 May 2020 15:28:44 +0000
(17:28 +0200)
committer
crouzet
<nicolas.crouzet@cea.fr>
Mon, 25 May 2020 15:28:44 +0000
(17:28 +0200)
src/system.py
patch
|
blob
|
history
diff --git
a/src/system.py
b/src/system.py
index 33608074be29fcece617cfd57b81976518b4890b..56141bcee5a6202fc4c3f51eb617ccb8669e2f0f 100644
(file)
--- a/
src/system.py
+++ b/
src/system.py
@@
-69,7
+69,10
@@
def git_describe(repo_path):
return False
else:
tag_description=p.stdout.readlines()[0].strip()
return False
else:
tag_description=p.stdout.readlines()[0].strip()
- return tag_description.decode('utf-8')
+ # with python3 this utf8 bytes should be decoded
+ if isinstance(tag_description, bytes):
+ tag_description=tag_description.decode("utf-8", "ignore")
+ return tag_description
def git_extract(from_what, tag, where, logger, environment=None):
def git_extract(from_what, tag, where, logger, environment=None):
@@
-377,10
+380,14
@@
def check_system_pkg(check_cmd,pkg):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
output, err = p.communicate()
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
output, err = p.communicate()
+
rc = p.returncode
if rc==0:
msg_status=src.printcolors.printcSuccess("OK")
if check_cmd[0]=="rpm": # apt output is too messy for being used
rc = p.returncode
if rc==0:
msg_status=src.printcolors.printcSuccess("OK")
if check_cmd[0]=="rpm": # apt output is too messy for being used
+ # in python3 output is a byte and should be decoded
+ if isinstance(output, bytes):
+ output = output.decode("utf-8", "ignore")
msg_status+=" (" + output.replace('\n',' ') + ")\n" # remove output trailing \n
else:
msg_status=src.printcolors.printcError("KO")
msg_status+=" (" + output.replace('\n',' ') + ")\n" # remove output trailing \n
else:
msg_status=src.printcolors.printcError("KO")