Fixing invalid null byte handling for python 2

This commit is contained in:
Michael Lazar
2018-04-07 16:18:48 -04:00
parent 81621913bd
commit 76b10817d9

View File

@@ -275,8 +275,10 @@ class Terminal(object):
text = self.clean(text, n_cols)
params = [] if attr is None else [attr]
window.addstr(row, col, text, *params)
except (curses.error, ValueError) as e:
# window.addstr could raise "ValueError: embedded null byte"
except (curses.error, ValueError, TypeError) as e:
# Curses handling of strings with invalid null bytes (b'\00')
# python 2: TypeError: "int,int,str"
# python 3: ValueError: "embedded null byte"
_logger.warning('add_line raised an exception')
_logger.exception(str(e))