nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2025-01-02 06:27:55 +03:00
Code Issues Projects Releases Wiki Activity

Drive name with special characters causes crash (correct) #1383

Browse Source
This commit is contained in:
nicolargo 2018-12-31 11:27:31 +01:00
parent 1e42fe4f9d
commit 457efd2496
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glances/compat.py
View File

@ -97,7 +97,10 @@ if PY3:
def nativestr(s):
if isinstance(s, text_type):
return s
return s.decode('utf-8', 'replace')
elif isinstance(s, (int, float)):
return s.__str__()
else:
return s.decode('utf-8', 'replace')
def system_exec(command):
"""Execute a system command and return the resul as a str"""
@ -177,7 +180,10 @@ else:
def nativestr(s):
if isinstance(s, binary_type):
return s
return s.encode('utf-8', 'replace')
elif isinstance(s, (int, float)):
return s.__str__()
else:
return s.encode('utf-8', 'replace')
def system_exec(command):
"""Execute a system command and return the resul as a str"""