gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #539 from michael-lazar/null_byte_error_py2

Browse Source 
Fixing invalid null byte handling for python 2
This commit is contained in:
Michael Lazar
2018-04-07 16:28:21 -04:00
committed by GitHub
parent 81621913bd 76b10817d9
commit 84e3737c11
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtv/terminal.py
View File

@@ -275,8 +275,10 @@ class Terminal(object):
text = self.clean(text, n_cols) text = self.clean(text, n_cols)
params = [] if attr is None else [attr] params = [] if attr is None else [attr]
window.addstr(row, col, text, *params) window.addstr(row, col, text, *params)
except (curses.error, ValueError) as e: except (curses.error, ValueError, TypeError) as e:
# window.addstr could raise "ValueError: embedded null byte" # 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.warning('add_line raised an exception')
_logger.exception(str(e)) _logger.exception(str(e))