prevent implicit decoding from string format

This commit is contained in:
Alan Hamlett 2016-04-29 16:56:48 +02:00
parent ca94272de5
commit 5ef2e6954e

View file

@ -46,7 +46,6 @@ if is_py2:
if text is None: if text is None:
return None return None
try: try:
text = str(text)
return text.decode('utf-8') return text.decode('utf-8')
except: except:
try: try:
@ -318,7 +317,7 @@ def find_python_in_folder(folder, headless=True):
if not retcode and pattern.search(output): if not retcode and pattern.search(output):
return path return path
except: except:
log(DEBUG, u('Python Version Output: {0}').format(u(sys.exc_info()[1]))) log(DEBUG, u(sys.exc_info()[1]))
if headless: if headless:
path = find_python_in_folder(folder, headless=False) path = find_python_in_folder(folder, headless=False)