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

Add a method to convert str to ascii in Python 3

Browse Source
This commit is contained in:
nicolargo 2017-12-16 15:05:06 +01:00
parent 1a4219b208
commit 54b61fd5a0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glances/compat.py
View File

@ -64,7 +64,9 @@ if PY3:
def to_ascii(s): def to_ascii(s):
"""Convert the bytes string to a ASCII string """Convert the bytes string to a ASCII string
Usefull to remove accent (diacritics)""" Usefull to remove accent (diacritics)"""
return str(s, 'utf-8') if isinstance(s, binary_type):
return s
return s.encode('ascii', 'ignore')
def listitems(d): def listitems(d):
return list(d.items()) return list(d.items())
@ -124,7 +126,7 @@ else:
Usefull to remove accent (diacritics)""" Usefull to remove accent (diacritics)"""
if isinstance(s, binary_type): if isinstance(s, binary_type):
return s return s
return unicodedata.normalize('NFKD', s).encode('ASCII', 'ignore') return unicodedata.normalize('NFKD', s).encode('ascii', 'ignore')
def listitems(d): def listitems(d):
return d.items() return d.items()