July 2016 - tor-commits - lists.torproject.org

[nyx/master] Occasional stacktraces when starting up
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 702d8d329b8c305b0dc7207e550b6d89b98aab25 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 23 11:41:58 2016 -0700 Occasional stacktraces when starting up When starting up we occasionally flashed a stacktrace such as... File "/home/atagar/Desktop/nyx/nyx/panel/graph.py", line 596, in _update_accounting if not nyx_controller.is_paused(): AttributeError 'NoneType' object has no attribute 'is_paused' The issue is that our Controller's constructor creates panels which in turn have threads that use the still-incomplete controller. As such breaking the constructor into two parts. The first creates a blank instance and the second adds the panels. Don't really like this but fixes the issue. I'll revisit this when it's the controller's turn to be rewitten. --- nyx/controller.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index d02dbeb..8040e7e 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -98,9 +98,18 @@ class Controller(object): top to bottom on the page. """ - self._header_panel = nyx.panel.header.HeaderPanel() + self._page_panels = [] + self._header_panel = None + self.quit_signal = False + self._page = 0 + self._paused = False + self._pause_time = -1 + self._force_redraw = False + self._last_drawn = 0 - self._page_panels, first_page_panels = [], [] + def init(self): + self._header_panel = nyx.panel.header.HeaderPanel() + first_page_panels = [] if CONFIG['features.panels.show.graph']: first_page_panels.append(nyx.panel.graph.GraphPanel()) @@ -330,6 +339,7 @@ def start_nyx(): global NYX_CONTROLLER NYX_CONTROLLER = Controller() + NYX_CONTROLLER.init() control = get_controller() if not CONFIG['features.acsSupport']:

1 0

[nyx/master] Include @require_curses in interpreter tests
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 07a0599f434c49f25e3efa984dc55a05a838a28b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 31 12:36:08 2016 -0700 Include @require_curses in interpreter tests Our tests were actually pretty good. Just rearranging things a bit and adding @require_curses to the ones that need curses. --- nyx/panel/interpreter.py | 2 +- test/panel/interpreter.py | 90 +++++++++++++++++++++++++++++++---------------- 2 files changed, 60 insertions(+), 32 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 5a08796..ae929ca 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -55,7 +55,7 @@ class InterpreterPanel(nyx.panel.Panel): controller = tor_controller() self._autocompleter = stem.interpreter.autocomplete.Autocompleter(controller) - self._interpreter = stem.interpreter.commands.ControlInterpretor(controller) + self._interpreter = stem.interpreter.commands.ControlInterpreter(controller) self._interpreter._run_python_commands = False def key_handlers(self): diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index fda70f3..b24a51f 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -8,6 +8,7 @@ import nyx.curses import nyx.panel.interpreter import test +from test import require_curses from mock import patch EXPECTED_PANEL = """ @@ -27,61 +28,88 @@ Control Interpreter: >>> to use this panel press enter """.strip() +EXPECTED_WITH_SCROLLBAR = """ +Control Interpreter: + |>>> GETINFO version + |250-version=0.2.4.27 (git-412e3f7dc9c6c01a) + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | + | +-+ +""".strip() + class TestInterpreter(unittest.TestCase): - def test_format_prompt_input(self): - user_input = 'getinfo' - output = nyx.panel.interpreter._format_prompt_input(user_input) + def test_format_prompt_input_with_interperter_command(self): + output = nyx.panel.interpreter._format_prompt_input('/help') self.assertEqual(2, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) - self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) + self.assertEqual(('/help', ('Magenta', 'Bold')), output[1]) - user_input = 'getinfo version' - output = nyx.panel.interpreter._format_prompt_input(user_input) - self.assertEqual(3, len(output)) + def test_format_prompt_input_with_command(self): + output = nyx.panel.interpreter._format_prompt_input('GETINFO') + self.assertEqual(2, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) - self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) - self.assertEqual(('version', ('Cyan', 'Bold')), output[2]) + self.assertEqual(('GETINFO ', ('Green', 'Bold')), output[1]) - user_input = '/help' - output = nyx.panel.interpreter._format_prompt_input(user_input) - self.assertEqual(2, len(output)) + def test_format_prompt_input_with_command_and_arg(self): + output = nyx.panel.interpreter._format_prompt_input('GETINFO version') + self.assertEqual(3, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) - self.assertEqual(('/help', ('Magenta', 'Bold')), output[1]) + self.assertEqual(('GETINFO ', ('Green', 'Bold')), output[1]) + self.assertEqual(('version', ('Cyan', 'Bold')), output[2]) + @require_curses @patch('nyx.panel.interpreter.tor_controller') - def test_rendering_panel(self, tor_controller_mock): + def test_blank_panel(self, tor_controller_mock): tor_controller_mock()._handle_event = lambda event: None + panel = nyx.panel.interpreter.InterpreterPanel() self.assertEqual(EXPECTED_PANEL, test.render(panel._draw).content) panel._is_input_mode = True self.assertEqual(EXPECTED_PANEL_INPUT_MODE, test.render(panel._draw).content) + @require_curses @patch('nyx.panel.interpreter.tor_controller') - def test_rendering_multiline_panel(self, tor_controller_mock): + def test_multiline_panel(self, tor_controller_mock): tor_controller_mock()._handle_event = lambda event: None + panel = nyx.panel.interpreter.InterpreterPanel() - panel._lines = [[('>>> ', ('Green', 'Bold')), ('GETINFO', ('Green', 'Bold')), (' version', ('Cyan',))]] - panel._lines.append([('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', ('Blue',))]) + panel._lines = [ + [('>>> ', ('Green', 'Bold')), ('GETINFO', ('Green', 'Bold')), (' version', ('Cyan',))], + [('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', ('Blue',))] + ] + self.assertEqual(EXPECTED_MULTILINE_PANEL, test.render(panel._draw).content) + @require_curses @patch('nyx.panel.interpreter.tor_controller') def test_scrollbar(self, tor_controller_mock): tor_controller_mock()._handle_event = lambda event: None - panel = nyx.panel.interpreter.InterpreterPanel() - self.assertIsInstance(panel._scroller, nyx.curses.Scroller) - height = panel.get_height() - panel._lines = [()] * height - output_lines = test.render(panel._draw).content.split('\n') - self.assertEqual(height, len(output_lines)) - - @patch('nyx.panel.interpreter.tor_controller') - def test_key_handlers(self, tor_controller_mock): - tor_controller_mock()._handle_event = lambda event: None panel = nyx.panel.interpreter.InterpreterPanel() - output = panel.key_handlers() - self.assertEqual(2, len(output)) - self.assertEqual('enter', output[0].key) - self.assertEqual('arrows', output[1].key) + panel._lines = [ + [('>>> ', ('Green', 'Bold')), ('GETINFO', ('Green', 'Bold')), (' version', ('Cyan',))], + [('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', ('Blue',))] + ] + [()] * (panel.get_height() - 2) + + self.assertEqual(EXPECTED_WITH_SCROLLBAR, test.render(panel._draw).content)

1 0

[nyx/master] Tidy up interpreter panel
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit d774e22d492416a0725c0f915d5ac5001cf73c37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 30 10:29:09 2016 -0700 Tidy up interpreter panel Now that this is a lot simpler we can rearrange things to make _execute_command() simpler. --- nyx/panel/interpreter.py | 92 +++++++++++++++++++++++++---------------------- test/panel/interpreter.py | 10 +++--- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index cf0f261..5a08796 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel providing raw control port access with syntax hilighting, usage information, tab completion, and other usability features. @@ -6,45 +9,43 @@ information, tab completion, and other usability features. import curses import nyx.controller import nyx.curses - -from nyx.curses import GREEN, MAGENTA, CYAN, BOLD, HIGHLIGHT -from nyx import tor_controller, panel +import nyx.panel import stem import stem.interpreter.autocomplete import stem.interpreter.commands +from nyx import tor_controller +from nyx.curses import GREEN, MAGENTA, CYAN, BOLD, HIGHLIGHT USER_INPUT_BACKLOG_LIMIT = 100 -PROMPT = [('>>> ', (GREEN, BOLD)), ('to use this panel press enter', (CYAN, BOLD))] +PROMPT = ('>>> ', (GREEN, BOLD)) +PROMPT_USAGE = ('to use this panel press enter', (CYAN, BOLD)) -def format_input(user_input): - output = [('>>> ', (GREEN, BOLD))] - if ' ' in user_input: - cmd, arg = user_input.split(' ', 1) - else: - cmd, arg = user_input, '' +def _format_prompt_input(user_input): + line = [PROMPT] + cmd, arg = user_input.split(' ', 1) if ' ' in user_input else (user_input, '') if cmd.startswith('/'): - output.append((user_input, (MAGENTA, BOLD))) + line.append((user_input, (MAGENTA, BOLD))) else: - output.append((cmd + ' ', (GREEN, BOLD))) + line.append((cmd + ' ', (GREEN, BOLD))) + if arg: - output.append((arg, (CYAN, BOLD))) + line.append((arg, (CYAN, BOLD))) - return output + return line -class InterpreterPanel(panel.Panel): +class InterpreterPanel(nyx.panel.Panel): """ - Renders the interpreter panel with a prompt providing raw control port - access. + Prompt with raw control port access. """ def __init__(self): - panel.Panel.__init__(self) + nyx.panel.Panel.__init__(self) self._is_input_mode = False self._x_offset = 0 @@ -65,44 +66,48 @@ class InterpreterPanel(panel.Panel): if is_changed: self.redraw() - def _execute_command(): + def _prompt_input(): + _scroll(nyx.curses.KeyInput(curses.KEY_END)) # scroll to bottom + self.redraw() + + return nyx.curses.str_input( + 4 + self._x_offset, + self.get_top() + max(1, min(len(self._lines) + 1, self.get_height() - 1)), + backlog = self._user_inputs, + tab_completion = self._autocompleter.matches + ).strip() + + def _start_input_mode(): self._is_input_mode = True while self._is_input_mode: - self.redraw() - _scroll(nyx.curses.KeyInput(curses.KEY_END)) - page_height = self.get_height() - 1 - - user_input = nyx.curses.str_input( - 4 + self._x_offset, - self.get_top() + max(len(self._lines[-page_height:]), 1), - backlog = self._user_inputs, - tab_completion = self._autocompleter.matches - ).strip() + user_input = _prompt_input() if not user_input: self._is_input_mode = False - else: - self._user_inputs.append(user_input) + break + + self._user_inputs.append(user_input) - if len(self._user_inputs) > USER_INPUT_BACKLOG_LIMIT: - self._user_inputs = self._user_inputs[-USER_INPUT_BACKLOG_LIMIT:] + if len(self._user_inputs) > USER_INPUT_BACKLOG_LIMIT: + self._user_inputs = self._user_inputs[-USER_INPUT_BACKLOG_LIMIT:] - try: - response = self._interpreter.run_command(user_input) + try: + response = self._interpreter.run_command(user_input) + except stem.SocketClosed: + self._is_input_mode = False + break - if response: - self._lines.append(format_input(user_input)) + self._lines.append(_format_prompt_input(user_input)) - for line in response.split('\n'): - self._lines.append([(text, attr) for text, attr in nyx.curses.asci_to_curses(line)]) - except stem.SocketClosed: - self._is_input_mode = False + if response: + for line in response.split('\n'): + self._lines.append([(text, attr) for text, attr in nyx.curses.asci_to_curses(line)]) self.redraw() return ( - nyx.panel.KeyHandler('enter', 'execute a command', _execute_command, key_func = lambda key: key.is_selection()), + nyx.panel.KeyHandler('enter', 'execute a command', _start_input_mode, key_func = lambda key: key.is_selection()), nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), ) @@ -113,12 +118,13 @@ class InterpreterPanel(panel.Panel): subwindow.addstr(0, 0, 'Control Interpreter:', HIGHLIGHT) scroll = self._scroller.location(len(self._lines) + 1, subwindow.height - 1) + prompt = [PROMPT] if self._is_input_mode else [PROMPT, PROMPT_USAGE] if len(self._lines) > subwindow.height - 2: self._x_offset = 2 subwindow.scrollbar(1, scroll, len(self._lines)) - for i, line in enumerate(self._lines + [PROMPT]): + for i, line in enumerate(self._lines + [prompt]): x, y = self._x_offset, i + 1 - scroll if y > 0: diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index 4686fed..fda70f3 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -17,7 +17,7 @@ Control Interpreter: EXPECTED_PANEL_INPUT_MODE = """ Control Interpreter (enter "/help" for usage or a blank line to stop): ->>> to use this panel press enter +>>> """.strip() EXPECTED_MULTILINE_PANEL = """ @@ -29,22 +29,22 @@ Control Interpreter: class TestInterpreter(unittest.TestCase): - def test_format_input(self): + def test_format_prompt_input(self): user_input = 'getinfo' - output = nyx.panel.interpreter.format_input(user_input) + output = nyx.panel.interpreter._format_prompt_input(user_input) self.assertEqual(2, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) user_input = 'getinfo version' - output = nyx.panel.interpreter.format_input(user_input) + output = nyx.panel.interpreter._format_prompt_input(user_input) self.assertEqual(3, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) self.assertEqual(('version', ('Cyan', 'Bold')), output[2]) user_input = '/help' - output = nyx.panel.interpreter.format_input(user_input) + output = nyx.panel.interpreter._format_prompt_input(user_input) self.assertEqual(2, len(output)) self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) self.assertEqual(('/help', ('Magenta', 'Bold')), output[1])

1 0

[nyx/master] Support python interpreter commands
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 2e3d9899df317b59241d10c3a5a48fba0f6666ca Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 31 16:16:37 2016 -0700 Support python interpreter commands Addressed the main gotcha Sambuddha was running into in Stem... https://gitweb.torproject.org/stem.git/commit/?id=ae48d81 Then just took a little more work to address multi-line python input. --- nyx/curses.py | 2 +- nyx/panel/interpreter.py | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index b5819cc..27cfbfc 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -305,7 +305,7 @@ def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): if tab_completion: handler = functools.partial(_handle_tab_completion, handler, tab_completion) - user_input = textbox.edit(lambda key: handler(textbox, key)).strip() + user_input = textbox.edit(lambda key: handler(textbox, key)).rstrip() try: curses.curs_set(0) # hide cursor diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index ae929ca..4c63027 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -21,11 +21,12 @@ from nyx.curses import GREEN, MAGENTA, CYAN, BOLD, HIGHLIGHT USER_INPUT_BACKLOG_LIMIT = 100 PROMPT = ('>>> ', (GREEN, BOLD)) +MULTILINE_PROMPT = ('... ', ()) PROMPT_USAGE = ('to use this panel press enter', (CYAN, BOLD)) -def _format_prompt_input(user_input): - line = [PROMPT] +def _format_prompt_input(user_input, prompt = PROMPT): + line = [prompt] cmd, arg = user_input.split(' ', 1) if ' ' in user_input else (user_input, '') if cmd.startswith('/'): @@ -56,7 +57,6 @@ class InterpreterPanel(nyx.panel.Panel): controller = tor_controller() self._autocompleter = stem.interpreter.autocomplete.Autocompleter(controller) self._interpreter = stem.interpreter.commands.ControlInterpreter(controller) - self._interpreter._run_python_commands = False def key_handlers(self): def _scroll(key): @@ -75,7 +75,7 @@ class InterpreterPanel(nyx.panel.Panel): self.get_top() + max(1, min(len(self._lines) + 1, self.get_height() - 1)), backlog = self._user_inputs, tab_completion = self._autocompleter.matches - ).strip() + ) def _start_input_mode(): self._is_input_mode = True @@ -83,11 +83,12 @@ class InterpreterPanel(nyx.panel.Panel): while self._is_input_mode: user_input = _prompt_input() - if not user_input: + if not user_input and not self._interpreter.is_multiline_context: self._is_input_mode = False break self._user_inputs.append(user_input) + prompt = MULTILINE_PROMPT if self._interpreter.is_multiline_context else PROMPT if len(self._user_inputs) > USER_INPUT_BACKLOG_LIMIT: self._user_inputs = self._user_inputs[-USER_INPUT_BACKLOG_LIMIT:] @@ -98,7 +99,7 @@ class InterpreterPanel(nyx.panel.Panel): self._is_input_mode = False break - self._lines.append(_format_prompt_input(user_input)) + self._lines.append(_format_prompt_input(user_input, prompt)) if response: for line in response.split('\n'): @@ -118,7 +119,13 @@ class InterpreterPanel(nyx.panel.Panel): subwindow.addstr(0, 0, 'Control Interpreter:', HIGHLIGHT) scroll = self._scroller.location(len(self._lines) + 1, subwindow.height - 1) - prompt = [PROMPT] if self._is_input_mode else [PROMPT, PROMPT_USAGE] + + if self._interpreter.is_multiline_context: + prompt = [MULTILINE_PROMPT] + elif self._is_input_mode: + prompt = [PROMPT] + else: + prompt = [PROMPT, PROMPT_USAGE] if len(self._lines) > subwindow.height - 2: self._x_offset = 2

1 0

[nyx/master] Interpreter panel limited to two text attr
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit b6f25bcbd988a4c97562a2c41c533e894b75a389 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 26 09:45:27 2016 -0700 Interpreter panel limited to two text attr Why did we have this hardcoded size check? In practice it worked (we rarely have more than one color and one attribute), but the limitation is pointless. Changing our draw entries to be (text, (attr...)) tuples as we do everywhere else. This is still far from nice code but getting there bit by bit... --- nyx/panel/interpreter.py | 43 ++++++++++++++++--------------------------- test/panel/interpreter.py | 19 ++++++++++--------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 1dcb0e8..137ab9b 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -19,13 +19,12 @@ import stem.interpreter.autocomplete import stem.interpreter.commands -USAGE_INFO = 'to use this panel press enter' -PROMPT = '>>> ' BACKLOG_LIMIT = 100 +PROMPT = [('>>> ', (GREEN, BOLD)), ('to use this panel press enter', (CYAN, BOLD))] def format_input(user_input): - output = [(PROMPT, GREEN, BOLD)] + output = [('>>> ', (GREEN, BOLD))] if ' ' in user_input: cmd, arg = user_input.split(' ', 1) @@ -33,11 +32,11 @@ def format_input(user_input): cmd, arg = user_input, '' if cmd.startswith('/'): - output.append((user_input, MAGENTA, BOLD)) + output.append((user_input, (MAGENTA, BOLD))) else: - output.append((cmd + ' ', GREEN, BOLD)) + output.append((cmd + ' ', (GREEN, BOLD))) if arg: - output.append((arg, CYAN, BOLD)) + output.append((arg, (CYAN, BOLD))) return output @@ -60,7 +59,7 @@ class InterpreterPanel(panel.Panel): controller = tor_controller() self.autocompleter = stem.interpreter.autocomplete.Autocompleter(controller) self.interpreter = stem.interpreter.commands.ControlInterpretor(controller) - self.prompt_line = [[(PROMPT, GREEN, BOLD), (USAGE_INFO, CYAN, BOLD)]] + self._lines = [] def key_handlers(self): def _scroll(key): @@ -77,7 +76,7 @@ class InterpreterPanel(panel.Panel): self.redraw(True) _scroll(nyx.curses.KeyInput(curses.KEY_END)) page_height = self.get_height() - 1 - user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.get_top() + len(self.prompt_line[-page_height:]), '', list(reversed(self._backlog)), self.autocompleter.matches) + user_input = nyx.curses.str_input(4 + self._x_offset, self.get_top() + max(len(self._lines[-page_height:]), 1), '', list(reversed(self._backlog)), self.autocompleter.matches) user_input, is_done = user_input.strip(), False if not user_input: @@ -104,16 +103,12 @@ class InterpreterPanel(panel.Panel): sys.stderr = old_stderr response = '\x1b[31;1m' + new_stderr.getvalue() sys.stderr = old_stderr + if response: - self.prompt_line.insert(len(self.prompt_line) - 1, format_input(user_input)) + self._lines.append(format_input(user_input)) for line in response.split('\n'): - new_line = [] - - for text, attr in nyx.curses.asci_to_curses(line): - new_line.append([text] + list(attr)) - - self.prompt_line.insert(len(self.prompt_line) - 1, new_line) + self._lines.append([(text, attr) for text, attr in nyx.curses.asci_to_curses(line)]) except stem.SocketClosed: is_done = True @@ -134,18 +129,12 @@ class InterpreterPanel(panel.Panel): subwindow.scrollbar(1, scroll, self._last_content_height - 1) y = 1 - scroll - for entry in self.prompt_line: - cursor = self._x_offset - - for line in entry: - if len(line) == 2: - subwindow.addstr(cursor, y, line[0], line[1]) - elif len(line) == 3: - subwindow.addstr(cursor, y, line[0], line[1], line[2]) - try: - cursor += len(line[0]) - except: - pass + + for line in self._lines + [PROMPT]: + x = self._x_offset + + for text, attr in line: + x = subwindow.addstr(x, y, text, *attr) y += 1 diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index df42980..d036e32 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -24,6 +24,7 @@ EXPECTED_MULTILINE_PANEL = """ Control Interpreter: >>> GETINFO version 250-version=0.2.4.27 (git-412e3f7dc9c6c01a) +>>> to use this panel press enter """.strip() EXPECTED_SCROLLBAR_PANEL = ' |>>> to use this panel press enter' @@ -34,21 +35,21 @@ class TestInterpreter(unittest.TestCase): user_input = 'getinfo' output = nyx.panel.interpreter.format_input(user_input) self.assertEqual(2, len(output)) - self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) - self.assertEqual(('getinfo ', 'Green', 'Bold'), output[1]) + self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) + self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) user_input = 'getinfo version' output = nyx.panel.interpreter.format_input(user_input) self.assertEqual(3, len(output)) - self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) - self.assertEqual(('getinfo ', 'Green', 'Bold'), output[1]) - self.assertEqual(('version', 'Cyan', 'Bold'), output[2]) + self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) + self.assertEqual(('getinfo ', ('Green', 'Bold')), output[1]) + self.assertEqual(('version', ('Cyan', 'Bold')), output[2]) user_input = '/help' output = nyx.panel.interpreter.format_input(user_input) self.assertEqual(2, len(output)) - self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) - self.assertEqual(('/help', 'Magenta', 'Bold'), output[1]) + self.assertEqual(('>>> ', ('Green', 'Bold')), output[0]) + self.assertEqual(('/help', ('Magenta', 'Bold')), output[1]) @patch('nyx.panel.interpreter.tor_controller') def test_rendering_panel(self, tor_controller_mock): @@ -63,8 +64,8 @@ class TestInterpreter(unittest.TestCase): def test_rendering_multiline_panel(self, tor_controller_mock): tor_controller_mock()._handle_event = lambda event: None panel = nyx.panel.interpreter.InterpreterPanel() - panel.prompt_line = [[('>>> ', 'Green', 'Bold'), ('GETINFO', 'Green', 'Bold'), (' version', 'Cyan')]] - panel.prompt_line.append([('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', 'Blue')]) + panel._lines = [[('>>> ', ('Green', 'Bold')), ('GETINFO', ('Green', 'Bold')), (' version', ('Cyan',))]] + panel._lines.append([('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', ('Blue',))]) self.assertEqual(EXPECTED_MULTILINE_PANEL, test.render(panel._draw).content) @patch('nyx.panel.interpreter.tor_controller')

1 0

[nyx/master] Tab completion always moved cursor to end
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 2b17ec2b8c287a1268790da54e5f5ba32281a315 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 23 09:36:13 2016 -0700 Tab completion always moved cursor to end Curses' gather() method moves the cursor to the end of the message. As such whenever we call gather() we need to revert the cursor position afterward. Here's the repro steps for the issue... * in the interpreter panel type 'hello' * moved the cursor to the middle of the word * press tab, the cursor will move to the end of the line This was a bug copied from the arm 1.4.5 release (it was there too). --- nyx/curses.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 0cf9527..ecc2644 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -303,7 +303,7 @@ def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): def _handle_key(textbox, key): """ - Handles esc, home, end, right arrow, and resizing. We don't need ot handle + Handles esc, home, end, right arrow, and resizing. We don't need to handle the left arrow key because curses has reasonable behavior for that one. :param Textbox textbox: current textbox context @@ -322,7 +322,7 @@ def _handle_key(textbox, key): msg_length = len(textbox.gather()) textbox.win.move(y, x) # reverts cursor movement during gather call - if key == curses.KEY_END and msg_length > 0 and x < msg_length - 1: + if key == curses.KEY_END and x < msg_length - 1: textbox.win.move(y, msg_length - 1) # if we're in the content then move to the end elif key == curses.KEY_RIGHT and x < msg_length - 1: textbox.win.move(y, x + 1) # only move cursor if there's content after it @@ -393,9 +393,12 @@ def _handle_tab_completion(next_handler, tab_completion, textbox, key): """ if key == 9: + y, x = textbox.win.getyx() current_contents = textbox.gather().strip() - matches = tab_completion(current_contents) + textbox.win.move(y, x) # reverts cursor movement during gather call + new_input = None + matches = tab_completion(current_contents) if len(matches) == 1: new_input = matches[0] @@ -406,7 +409,6 @@ def _handle_tab_completion(next_handler, tab_completion, textbox, key): new_input = common_prefix if new_input: - y, _ = textbox.win.getyx() _, max_x = textbox.win.getmaxyx() textbox.win.clear() textbox.win.addstr(y, 0, new_input[:max_x - 1])

1 0

[nyx/master] Drop python command support
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit b55c9176e49fabc701ec81c97de121e06575c4e0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 29 09:46:09 2016 -0700 Drop python command support Hopefully it's temporary, we'll see. What we have here isn't a useful starting place. It uses Mock and stdout/stderr making it DOA. That aside, it doesn't work very well. Multi-line commands like the following break... for i in range(5): print i --- nyx/panel/interpreter.py | 49 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 915210b..cf0f261 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -3,14 +3,10 @@ Panel providing raw control port access with syntax hilighting, usage information, tab completion, and other usability features. """ -import code import curses import nyx.controller import nyx.curses -import sys -from cStringIO import StringIO -from mock import patch from nyx.curses import GREEN, MAGENTA, CYAN, BOLD, HIGHLIGHT from nyx import tor_controller, panel @@ -19,7 +15,7 @@ import stem.interpreter.autocomplete import stem.interpreter.commands -BACKLOG_LIMIT = 100 +USER_INPUT_BACKLOG_LIMIT = 100 PROMPT = [('>>> ', (GREEN, BOLD)), ('to use this panel press enter', (CYAN, BOLD))] @@ -54,11 +50,12 @@ class InterpreterPanel(panel.Panel): self._x_offset = 0 self._scroller = nyx.curses.Scroller() self._lines = [] - self._backlog = [] # previous user inputs + self._user_inputs = [] # previous user inputs controller = tor_controller() self._autocompleter = stem.interpreter.autocomplete.Autocompleter(controller) self._interpreter = stem.interpreter.commands.ControlInterpretor(controller) + self._interpreter._run_python_commands = False def key_handlers(self): def _scroll(key): @@ -75,34 +72,24 @@ class InterpreterPanel(panel.Panel): self.redraw() _scroll(nyx.curses.KeyInput(curses.KEY_END)) page_height = self.get_height() - 1 - user_input = nyx.curses.str_input(4 + self._x_offset, self.get_top() + max(len(self._lines[-page_height:]), 1), '', self._backlog, self._autocompleter.matches) - user_input, is_done = user_input.strip(), False + + user_input = nyx.curses.str_input( + 4 + self._x_offset, + self.get_top() + max(len(self._lines[-page_height:]), 1), + backlog = self._user_inputs, + tab_completion = self._autocompleter.matches + ).strip() if not user_input: - is_done = True + self._is_input_mode = False else: - self._backlog.append(user_input) + self._user_inputs.append(user_input) - if len(self._backlog) > BACKLOG_LIMIT: - self._backlog = self._backlog[-BACKLOG_LIMIT:] + if len(self._user_inputs) > USER_INPUT_BACKLOG_LIMIT: + self._user_inputs = self._user_inputs[-USER_INPUT_BACKLOG_LIMIT:] try: - console_called = False - - with patch('stem.interpreter.commands.code.InteractiveConsole.push') as console_push: - response = self._interpreter.run_command(user_input) - - if console_push.called: - console_called = True - - if console_called: - old_stderr = sys.stderr - sys.stderr = new_stderr = StringIO() - interactive_console = code.InteractiveConsole() - interactive_console.push(user_input) - sys.stderr = old_stderr - response = '\x1b[31;1m' + new_stderr.getvalue() - sys.stderr = old_stderr + response = self._interpreter.run_command(user_input) if response: self._lines.append(format_input(user_input)) @@ -110,11 +97,9 @@ class InterpreterPanel(panel.Panel): for line in response.split('\n'): self._lines.append([(text, attr) for text, attr in nyx.curses.asci_to_curses(line)]) except stem.SocketClosed: - is_done = True + self._is_input_mode = False - if is_done: - self._is_input_mode = False - self.redraw() + self.redraw() return ( nyx.panel.KeyHandler('enter', 'execute a command', _execute_command, key_func = lambda key: key.is_selection()),

1 0

[nyx/master] Interpreter panel broke after 100 inputs
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit c15e90aebb9c8397523c6bf5173f59baa4227cb2 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 28 10:47:38 2016 -0700 Interpreter panel broke after 100 inputs Guessing this is a leftover debugging statement? raise Exception(self._backlog) Can't think of any reason for it to be there, and it quite simply broke us when the user entered their 100th input. Inverting the order our backlog handler accepts to make our panel a little more efficient (there's no reason to invert our inputs on every call). --- nyx/curses.py | 21 ++++++++++++++------- nyx/panel/interpreter.py | 10 ++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 10ac4f0..b5819cc 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -274,7 +274,8 @@ def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): :param int x: horizontal location :param int y: vertical location :param str initial_text: initial input of the field - :param list backlog: previous inputs that can be selected by pressing up/down + :param list backlog: previous inputs that can be selected by pressing + up/down, oldest to newest :param func tab_completion: function to suggest inputs to tab complete with :returns: **str** with the user input or **None** if the prompt is canceled @@ -395,24 +396,30 @@ class _TextBacklog(object): """ def __init__(self, backlog = []): - self._backlog = backlog # backlog contents, newest to oldest - self._selection = -1 # selected item, -1 if we're not on the backlog + self._backlog = backlog # backlog contents, oldest to newest + self._selection = None # selected item, None if we're not on the backlog self._custom_input = '' # field's input prior to selecting a backlog item def _handler(self, next_handler, textbox, key): if key in (curses.KEY_UP, curses.KEY_DOWN): if key == curses.KEY_UP: - new_selection = min(len(self._backlog) - 1, self._selection + 1) + if self._selection is None: + new_selection = len(self._backlog) - 1 + else: + new_selection = max(0, self._selection - 1) else: - new_selection = max(-1, self._selection - 1) + if self._selection is None or self._selection == len(self._backlog) - 1: + new_selection = None + else: + new_selection = self._selection + 1 if self._selection == new_selection: return None - if self._selection == -1: + if self._selection is None: self._custom_input = textbox.gather().strip() # save custom input - new_input = self._custom_input if new_selection == -1 else self._backlog[new_selection] + new_input = self._custom_input if new_selection is None else self._backlog[new_selection] y, _ = textbox.win.getyx() _, max_x = textbox.win.getmaxyx() diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index c9d557d..915210b 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -53,8 +53,8 @@ class InterpreterPanel(panel.Panel): self._is_input_mode = False self._x_offset = 0 self._scroller = nyx.curses.Scroller() - self._backlog = [] self._lines = [] + self._backlog = [] # previous user inputs controller = tor_controller() self._autocompleter = stem.interpreter.autocomplete.Autocompleter(controller) @@ -75,18 +75,16 @@ class InterpreterPanel(panel.Panel): self.redraw() _scroll(nyx.curses.KeyInput(curses.KEY_END)) page_height = self.get_height() - 1 - user_input = nyx.curses.str_input(4 + self._x_offset, self.get_top() + max(len(self._lines[-page_height:]), 1), '', list(reversed(self._backlog)), self._autocompleter.matches) + user_input = nyx.curses.str_input(4 + self._x_offset, self.get_top() + max(len(self._lines[-page_height:]), 1), '', self._backlog, self._autocompleter.matches) user_input, is_done = user_input.strip(), False if not user_input: is_done = True else: self._backlog.append(user_input) - backlog_crop = len(self._backlog) - BACKLOG_LIMIT - if backlog_crop > 0: - raise Exception(self._backlog) - self._backlog = self._backlog[backlog_crop:] + if len(self._backlog) > BACKLOG_LIMIT: + self._backlog = self._backlog[-BACKLOG_LIMIT:] try: console_called = False

1 0

[nyx/master] Split up and expand _handle_key() tests
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 0549b59f6e30a031600c16533b21a99674f6f222 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 22 09:30:40 2016 -0700 Split up and expand _handle_key() tests Good tests but we should split them to be for individula actions when reasonable. Also improving them a bit. Picking the (40, 80) dimensions was a poor choice since it makes testing cursor movement difficult. I suspect Sambuddha thought that was the window dimention. It isn't - it's the cursor position so actually (0, x) is easier to work with. --- nyx/curses.py | 3 ++- test/subwindow.py | 63 ++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index e87239c..0cf9527 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -303,7 +303,8 @@ def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): def _handle_key(textbox, key): """ - Outputs the entered key onto the textbox. + Handles esc, home, end, right arrow, and resizing. We don't need ot handle + the left arrow key because curses has reasonable behavior for that one. :param Textbox textbox: current textbox context :param int key: key pressed diff --git a/test/subwindow.py b/test/subwindow.py index 2a03007..8eef938 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -11,7 +11,7 @@ import nyx.curses import nyx.panel.interpreter import test -from mock import call, Mock, patch +from mock import patch, call, Mock from test import require_curses @@ -72,6 +72,12 @@ NO_OP_HANDLER = lambda key, textbox: None DIMENSIONS = (40, 80) +def _textbox(x = 0): + textbox = Mock() + textbox.win.getyx.return_value = (0, x) + return textbox + + class TestCurses(unittest.TestCase): @require_curses def test_addstr(self): @@ -126,36 +132,45 @@ class TestCurses(unittest.TestCase): self.assertEqual(EXPECTED_SCROLLBAR_BOTTOM, test.render(_draw).content.strip()) - def test_handle_key(self): - textbox = Mock() - textbox.win.getyx.return_value = DIMENSIONS - self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 27)) + def test_handle_key_with_text(self): + self.assertEqual(ord('a'), nyx.curses._handle_key(_textbox(), ord('a'))) - textbox = Mock() - textbox.win.getyx.return_value = DIMENSIONS - textbox.win.move = Mock() - expected_call = call(DIMENSIONS[0], 0) + def test_handle_key_with_esc(self): + self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(_textbox(), 27)) + + def test_handle_key_with_home(self): + textbox = _textbox() nyx.curses._handle_key(textbox, curses.KEY_HOME) - self.assertTrue(textbox.win.move.called) - self.assertEquals(expected_call, textbox.win.move.call_args) + self.assertEquals(call(0, 0), textbox.win.move.call_args) - textbox = Mock() - textbox.win.getyx.return_value = DIMENSIONS + def test_handle_key_with_end(self): + textbox = _textbox() + textbox.gather.return_value = 'Sample Text' + nyx.curses._handle_key(textbox, curses.KEY_END) + self.assertEquals(call(0, 10), textbox.win.move.call_args) + + def test_handle_key_with_right_arrow(self): + textbox = _textbox() textbox.gather.return_value = 'Sample Text' - textbox.win.move = Mock() - expected_call = call(*DIMENSIONS) nyx.curses._handle_key(textbox, curses.KEY_RIGHT) - self.assertTrue(textbox.win.move.called) - self.assertEquals(expected_call, textbox.win.move.call_args) - textbox = Mock() - textbox.win.getyx.return_value = DIMENSIONS - self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 410)) + # move is called twice, to revert the gather() and move the cursor - textbox = Mock() - textbox.win.getyx.return_value = DIMENSIONS - key_pressed = ord('a') - self.assertEqual(key_pressed, nyx.curses._handle_key(textbox, key_pressed)) + self.assertEquals(2, textbox.win.move.call_count) + self.assertEquals(call(0, 1), textbox.win.move.call_args) + + def test_handle_key_with_right_arrow_at_end(self): + textbox = _textbox(10) + textbox.gather.return_value = 'Sample Text' + nyx.curses._handle_key(textbox, curses.KEY_RIGHT) + + # move is only called to revert the gather() + + self.assertEquals(1, textbox.win.move.call_count) + self.assertEquals(call(0, 10), textbox.win.move.call_args) + + def test_handle_key_when_resized(self): + self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(_textbox(), 410)) def test_handle_history_key(self): backlog = ['GETINFO version']

1 0

[nyx/master] Replace ansi_to_output() with a working function
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit bf44422c22507010c9712151b913d8969f1f873d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 25 10:43:32 2016 -0700 Replace ansi_to_output() with a working function Interpreter panel's ansi_to_output() is horribly overly simplistic. It formats the whole line with the attribute it starts with. For instance, /help output makes the whole thing bold rather than just the keyword. It also didn't recognize the color white. --- nyx/curses.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++ nyx/panel/interpreter.py | 29 +++++++---------------- test/panel/interpreter.py | 9 -------- test/subwindow.py | 10 ++++++++ 4 files changed, 77 insertions(+), 30 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index b33abd3..10ac4f0 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -18,6 +18,7 @@ if we want Windows support in the future too. curses_attr - curses encoded text attribute screen_size - provides the dimensions of our screen screenshot - dump of the present on-screen content + asci_to_curses - converts terminal formatting to curses halt - prevents further curses rendering during shutdown is_color_supported - checks if terminal supports color output @@ -88,6 +89,7 @@ import curses.ascii import curses.textpad import functools import os +import re import threading import stem.util.conf @@ -112,6 +114,7 @@ RED, GREEN, YELLOW, BLUE, CYAN, MAGENTA, BLACK, WHITE = list(Color) Attr = stem.util.enum.Enum('NORMAL', 'BOLD', 'UNDERLINE', 'HIGHLIGHT') NORMAL, BOLD, UNDERLINE, HIGHLIGHT = list(Attr) +ANSI_RE = re.compile('\x1B\[([0-9;]+)m') CURSES_COLORS = { Color.RED: curses.COLOR_RED, @@ -131,6 +134,18 @@ CURSES_ATTRIBUTES = { Attr.HIGHLIGHT: curses.A_STANDOUT, } +ASCI_TO_CURSES = { + '1': BOLD, + '30': BLACK, + '31': RED, + '32': GREEN, + '33': YELLOW, + '34': BLUE, + '35': MAGENTA, + '36': CYAN, + '37': WHITE, +} + DEFAULT_COLOR_ATTR = dict([(color, 0) for color in Color]) COLOR_ATTR = None @@ -460,6 +475,50 @@ def screenshot(): return '\n'.join(lines).rstrip() +def asci_to_curses(msg): + """ + Translates ANSI terminal escape sequences to curses formatting. + + :param str msg: string to be converted + + :returns: **list** series of (text, attr) tuples that's renderable by curses + """ + + entries, next_attr = [], () + match = ANSI_RE.search(msg) + + while match: + if match.start() > 0: + entries.append((msg[:match.start()], next_attr)) + + curses_attr = match.group(1).split(';') + new_attr = [ASCI_TO_CURSES[num] for num in curses_attr if num in ASCI_TO_CURSES] + + if '0' in curses_attr: + next_attr = tuple(new_attr) # includes a 'reset' + else: + combined_attr = list(next_attr) + + for attr in new_attr: + if attr in combined_attr: + continue + elif attr in Color: + # replace previous color with new one + combined_attr = filter(lambda attr: attr not in Color, combined_attr) + + combined_attr.append(attr) + + next_attr = tuple(combined_attr) + + msg = msg[match.end():] + match = ANSI_RE.search(msg) + + if msg: + entries.append((msg, next_attr)) + + return entries + + def halt(): """ Prevents further rendering of curses content while python's shutting down. diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 7775028..1dcb0e8 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -7,12 +7,11 @@ import code import curses import nyx.controller import nyx.curses -import re import sys from cStringIO import StringIO from mock import patch -from nyx.curses import BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BOLD, HIGHLIGHT, NORMAL +from nyx.curses import GREEN, MAGENTA, CYAN, BOLD, HIGHLIGHT from nyx import tor_controller, panel import stem @@ -22,25 +21,9 @@ import stem.interpreter.commands USAGE_INFO = 'to use this panel press enter' PROMPT = '>>> ' -ANSI_RE = re.compile('\\x1b\[([0-9;]*)m') -ATTRS = {'0': NORMAL, '1': BOLD, '30': BLACK, '31': RED, '32': GREEN, '33': YELLOW, '34': BLUE, '35': MAGENTA, '36': CYAN} BACKLOG_LIMIT = 100 -def ansi_to_output(line, attrs): - ansi_re = ANSI_RE.findall(line) - new_attrs = [] - - if line.find('\x1b[') == 0 and ansi_re: - for attr in ansi_re[0].split(';'): - new_attrs.append(ATTRS[attr]) - attrs = new_attrs - - line = ANSI_RE.sub('', line) - - return [(line, ) + tuple(attrs)], attrs - - def format_input(user_input): output = [(PROMPT, GREEN, BOLD)] @@ -123,10 +106,14 @@ class InterpreterPanel(panel.Panel): sys.stderr = old_stderr if response: self.prompt_line.insert(len(self.prompt_line) - 1, format_input(user_input)) - attrs = [] + for line in response.split('\n'): - line, attrs = ansi_to_output(line, attrs) - self.prompt_line.insert(len(self.prompt_line) - 1, line) + new_line = [] + + for text, attr in nyx.curses.asci_to_curses(line): + new_line.append([text] + list(attr)) + + self.prompt_line.insert(len(self.prompt_line) - 1, new_line) except stem.SocketClosed: is_done = True diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index 8283c5e..df42980 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -30,15 +30,6 @@ EXPECTED_SCROLLBAR_PANEL = ' |>>> to use this panel press enter' class TestInterpreter(unittest.TestCase): - def test_ansi_to_output(self): - ansi_text = '\x1b[32;1mthis is some sample text' - output_line, attrs = nyx.panel.interpreter.ansi_to_output(ansi_text, []) - - self.assertEqual('this is some sample text', output_line[0][0]) - self.assertEqual('Green', output_line[0][1]) - self.assertEqual('Bold', output_line[0][2]) - self.assertEqual(['Green', 'Bold'], attrs) - def test_format_input(self): user_input = 'getinfo' output = nyx.panel.interpreter.format_input(user_input) diff --git a/test/subwindow.py b/test/subwindow.py index 2df946e..db97970 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -14,6 +14,7 @@ import test from mock import call, Mock from test import require_curses +from nyx.curses import Color, Attr EXPECTED_ADDSTR_WRAP = """ 0123456789 0123456789 @@ -81,6 +82,15 @@ def _textbox(x = 0, text = ''): class TestCurses(unittest.TestCase): + def test_asci_to_curses(self): + self.assertEqual([], nyx.curses.asci_to_curses('')) + self.assertEqual([('hi!', ())], nyx.curses.asci_to_curses('hi!')) + self.assertEqual([('hi!', (Color.RED,))], nyx.curses.asci_to_curses('\x1b[31mhi!\x1b[0m')) + self.assertEqual([('boo', ()), ('hi!', (Color.RED, Attr.BOLD))], nyx.curses.asci_to_curses('boo\x1b[31;1mhi!\x1b[0m')) + self.assertEqual([('boo', ()), ('hi', (Color.RED,)), (' dami!', (Color.RED, Attr.BOLD))], nyx.curses.asci_to_curses('boo\x1b[31mhi\x1b[1m dami!\x1b[0m')) + self.assertEqual([('boo', ()), ('hi', (Color.RED,)), (' dami!', (Color.BLUE,))], nyx.curses.asci_to_curses('boo\x1b[31mhi\x1b[34m dami!\x1b[0m')) + self.assertEqual([('boo', ()), ('hi!', (Color.RED, Attr.BOLD)), ('and bye!', ())], nyx.curses.asci_to_curses('boo\x1b[31;1mhi!\x1b[0mand bye!')) + @require_curses def test_addstr(self): def _draw(subwindow):

1 0