github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

a bit optimized helpers

pull/2171/head
sebres 2018-07-04 18:37:25 +02:00
parent 7dffa7a2a1
commit 5a4b47464b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fail2ban/helpers.py
View File

@ -87,11 +87,11 @@ if sys.version_info >= (3,):
except (UnicodeDecodeError, UnicodeEncodeError): # pragma: no cover - unsure if reachable except (UnicodeDecodeError, UnicodeEncodeError): # pragma: no cover - unsure if reachable
if errors != 'strict': if errors != 'strict':
raise raise
return uni_decode(x, enc, 'replace') return x.decode(enc, 'replace')
def uni_string(x): def uni_string(x):
if not isinstance(x, bytes): if not isinstance(x, bytes):
return str(x) return str(x)
return uni_decode(x) return x.decode(PREFER_ENC, 'replace')
else: else:
def uni_decode(x, enc=PREFER_ENC, errors='strict'): def uni_decode(x, enc=PREFER_ENC, errors='strict'):
try: try:
@ -101,12 +101,12 @@ else:
except (UnicodeDecodeError, UnicodeEncodeError): # pragma: no cover - unsure if reachable except (UnicodeDecodeError, UnicodeEncodeError): # pragma: no cover - unsure if reachable
if errors != 'strict': if errors != 'strict':
raise raise
return uni_decode(x, enc, 'replace') return x.encode(enc, 'replace')
if sys.getdefaultencoding().upper() != 'UTF-8': if sys.getdefaultencoding().upper() != 'UTF-8': # pragma: no cover - utf-8 is default encoding now
def uni_string(x): def uni_string(x):
if not isinstance(x, unicode): if not isinstance(x, unicode):
return str(x) return str(x)
return uni_decode(x) return x.encode(PREFER_ENC, 'replace')
else: else:
uni_string = str uni_string = str