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

[nyx/master] Make str_input() helpers private
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit f7fb291641fbbcb1048ebcba59660d326df09be3 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 18 09:24:56 2016 -0700 Make str_input() helpers private They're internal helpers that are only used within this file. They shouldn't be public. --- nyx/controller.py | 2 +- nyx/curses.py | 112 +++++++++++++++++++++++++++--------------------------- test/subwindow.py | 30 +++++++-------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 54316a0..d02dbeb 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -18,9 +18,9 @@ import nyx.panel.config import nyx.panel.connection import nyx.panel.graph import nyx.panel.header +import nyx.panel.interpreter import nyx.panel.log import nyx.panel.torrc -import nyx.panel.interpreter import stem diff --git a/nyx/curses.py b/nyx/curses.py index 2bd9c06..3767cd3 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -14,9 +14,6 @@ if we want Windows support in the future too. start - initializes curses with the given function raw_screen - provides direct access to the curses screen key_input - get keypress by user - str_input_handle_key - helper function to display content in text field - str_input_handle_history_key - handle up/down arrow key in text field - str_input_handle_tab_completion - handle tab completion in text field str_input - text field where user can input a string curses_attr - curses encoded text attribute screen_size - provides the dimensions of our screen @@ -250,7 +247,55 @@ def key_input(input_timeout = None): return KeyInput(CURSES_SCREEN.getch()) -def str_input_handle_key(textbox, key): +def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): + """ + Provides a text field where the user can input a string, blocking until + they've done so and returning the result. If the user presses escape then + this terminates and provides back **None**. + + This blanks any content within the space that the input field is rendered + (otherwise stray characters would be interpreted as part of the initial + input). + + :param int x: horizontal location + :param int y: vertical location + :param str initial_text: initial input of the field + + :returns: **str** with the user input or **None** if the prompt is canceled + """ + + with CURSES_LOCK: + if HALT_ACTIVITY: + return None + + try: + curses.curs_set(1) # show cursor + except curses.error: + pass + + width = screen_size().width - x + + curses_subwindow = CURSES_SCREEN.subwin(1, width, y, x) + curses_subwindow.erase() + curses_subwindow.addstr(0, 0, initial_text[:width - 1]) + + textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) + if tab_completion is not None: + user_input = textbox.edit(lambda key: _handle_tab_completion(textbox, key, backlog, tab_completion)).strip() + elif backlog is not None: + user_input = textbox.edit(lambda key: _handle_history_key(textbox, key, backlog)).strip() + else: + user_input = textbox.edit(lambda key: _handle_key(textbox, key)).strip() + + try: + curses.curs_set(0) # hide cursor + except curses.error: + pass + + return None if textbox.lastcmd == curses.ascii.BEL else user_input + + +def _handle_key(textbox, key): """ Outputs the entered key onto the textbox. @@ -259,6 +304,7 @@ def str_input_handle_key(textbox, key): :returns: **str** with the user input or **None** if the prompt is canceled """ + y, x = textbox.win.getyx() if key == 27: @@ -282,7 +328,7 @@ def str_input_handle_key(textbox, key): return key -def str_input_handle_history_key(textbox, key, backlog): +def _handle_history_key(textbox, key, backlog): """ Handles history validation. When the up/down arrow keys are pressed, the relative previous/next commands are shown. @@ -294,7 +340,9 @@ def str_input_handle_history_key(textbox, key, backlog): :returns: **None** if up/down arrow key is pressed or calls function to write key to the textbox """ + global HISTORY_DICT + if key in (curses.KEY_UP, curses.KEY_DOWN): offset = 1 if key == curses.KEY_UP else -1 new_selection = HISTORY_DICT['selection_index'] + offset @@ -322,10 +370,10 @@ def str_input_handle_history_key(textbox, key, backlog): HISTORY_DICT['selection_index'] = new_selection return None - return str_input_handle_key(textbox, key) + return _handle_key(textbox, key) -def str_input_handle_tab_completion(textbox, key, backlog, tab_completion): +def _handle_tab_completion(textbox, key, backlog, tab_completion): """ Handles tab completion. If the tab key is pressed, the current textbox contents are checked for probable commands. @@ -361,55 +409,7 @@ def str_input_handle_tab_completion(textbox, key, backlog, tab_completion): return None - return str_input_handle_history_key(textbox, key, backlog) - - -def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): - """ - Provides a text field where the user can input a string, blocking until - they've done so and returning the result. If the user presses escape then - this terminates and provides back **None**. - - This blanks any content within the space that the input field is rendered - (otherwise stray characters would be interpreted as part of the initial - input). - - :param int x: horizontal location - :param int y: vertical location - :param str initial_text: initial input of the field - - :returns: **str** with the user input or **None** if the prompt is canceled - """ - - with CURSES_LOCK: - if HALT_ACTIVITY: - return None - - try: - curses.curs_set(1) # show cursor - except curses.error: - pass - - width = screen_size().width - x - - curses_subwindow = CURSES_SCREEN.subwin(1, width, y, x) - curses_subwindow.erase() - curses_subwindow.addstr(0, 0, initial_text[:width - 1]) - - textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) - if tab_completion is not None: - user_input = textbox.edit(lambda key: str_input_handle_tab_completion(textbox, key, backlog, tab_completion)).strip() - elif backlog is not None: - user_input = textbox.edit(lambda key: str_input_handle_history_key(textbox, key, backlog)).strip() - else: - user_input = textbox.edit(lambda key: str_input_handle_key(textbox, key)).strip() - - try: - curses.curs_set(0) # hide cursor - except curses.error: - pass - - return None if textbox.lastcmd == curses.ascii.BEL else user_input + return _handle_history_key(textbox, key, backlog) def curses_attr(*attributes): diff --git a/test/subwindow.py b/test/subwindow.py index 0f6f6a6..3f58278 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -123,18 +123,18 @@ class TestCurses(unittest.TestCase): self.assertEqual(EXPECTED_SCROLLBAR_BOTTOM, test.render(_draw).content.strip()) - def test_str_input_handle_key(self): + def test_handle_key(self): dimensions = (40, 80) textbox = Mock() textbox.win.getyx.return_value = dimensions - self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 27)) + self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 27)) textbox = Mock() textbox.win.getyx.return_value = dimensions textbox.win.move = Mock() expected_call = call(dimensions[0], 0) - nyx.curses.str_input_handle_key(textbox, curses.KEY_HOME) + nyx.curses._handle_key(textbox, curses.KEY_HOME) self.assertTrue(textbox.win.move.called) self.assertEquals(expected_call, textbox.win.move.call_args) @@ -143,34 +143,34 @@ class TestCurses(unittest.TestCase): textbox.gather.return_value = 'Sample Text' textbox.win.move = Mock() expected_call = call(*dimensions) - nyx.curses.str_input_handle_key(textbox, curses.KEY_RIGHT) + 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.str_input_handle_key(textbox, 410)) + self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 410)) textbox = Mock() textbox.win.getyx.return_value = dimensions key_pressed = ord('a') - self.assertEqual(key_pressed, nyx.curses.str_input_handle_key(textbox, key_pressed)) + self.assertEqual(key_pressed, nyx.curses._handle_key(textbox, key_pressed)) - @patch('nyx.curses.str_input_handle_key') - def test_str_input_handle_history_key(self, mock_str_input_handle_key): + @patch('nyx.curses._handle_key') + def test_handle_history_key(self, mock_handle_key): backlog = ['GETINFO version'] dimensions = (40, 80) textbox = Mock() textbox.win.getyx.return_value = dimensions - self.assertIsNone(nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, [])) + self.assertIsNone(nyx.curses._handle_history_key(textbox, curses.KEY_UP, [])) textbox = Mock() textbox.win.getyx.return_value = dimensions textbox.win.getmaxyx.return_value = dimensions textbox.win.addstr = Mock() textbox.win.move = Mock() - nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, backlog) + nyx.curses._handle_history_key(textbox, curses.KEY_UP, backlog) self.assertTrue(textbox.win.clear.called) expected_addstr_call = call(dimensions[0], 0, backlog[0]) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) @@ -178,11 +178,11 @@ class TestCurses(unittest.TestCase): self.assertEqual(expected_move_call, textbox.win.move.call_args) textbox = Mock() - nyx.curses.str_input_handle_history_key(textbox, curses.KEY_LEFT, []) - self.assertTrue(mock_str_input_handle_key.called) + nyx.curses._handle_history_key(textbox, curses.KEY_LEFT, []) + self.assertTrue(mock_handle_key.called) - @patch('nyx.curses.str_input_handle_history_key') - def test_str_input_handle_tab_completion(self, mock_str_input_handle_history_key): + @patch('nyx.curses._handle_history_key') + def test_handle_tab_completion(self, mock_handle_history_key): dimensions = (40, 80) tab_completion_content = 'GETINFO version' @@ -193,7 +193,7 @@ class TestCurses(unittest.TestCase): textbox.win.move = Mock() tab_completion = Mock() tab_completion.return_value = [tab_completion_content] - nyx.curses.str_input_handle_tab_completion(textbox, 9, [], tab_completion) + nyx.curses._handle_tab_completion(textbox, 9, [], tab_completion) self.assertTrue(textbox.win.clear.called) expected_addstr_call = call(dimensions[0], 0, tab_completion_content) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args)

1 0

[nyx/master] Missing params from str_input() pydocs
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit e45856eec94f059197a59cb5f7d1c196aea5db92 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:48:36 2016 -0700 Missing params from str_input() pydocs Added a couple new parameters but weren't documented. Also, these functions don't care that Stem has an autocompletion module - all it cares about is that it takes a function that suggests tab completion results. It can be provided with other functions too. --- nyx/curses.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index a6a8b2d..004a480 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -261,6 +261,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 func tab_completion: function to suggest inputs to tab complete with :returns: **str** with the user input or **None** if the prompt is canceled """ @@ -384,8 +386,7 @@ def _handle_tab_completion(next_handler, tab_completion, textbox, key): contents are checked for probable commands. :param func next_handler: handler to invoke after this - :param Autocompleter.matches tab_completion: function to suggest probable - commands based on current content + :param func tab_completion: function to suggest inputs to tab complete with :param Textbox textbox: current textbox context :param int key: key pressed

1 0

[nyx/master] Make test dimensions a constant
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit 0a87754f0a597be30a8114091f0bd2dcdc24048b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 21 09:38:55 2016 -0700 Make test dimensions a constant It's a static tuple value. This should be a constant. --- nyx/curses.py | 16 +++++++--------- test/subwindow.py | 37 +++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 004a480..e87239c 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -336,16 +336,14 @@ def _handle_key(textbox, key): def _handle_history_key(next_handler, backlog, textbox, key): """ - Handles history validation. When the up/down arrow keys are pressed, - the relative previous/next commands are shown. + Allows user to select previous inputs when pressing up/down. :param func next_handler: handler to invoke after this - :param list backlog: backlog of all previous commands entered + :param list backlog: backlog of all previous commands :param Textbox textbox: current textbox context :param int key: key pressed - :returns: **None** if up/down arrow key is pressed or calls function - to write key to the textbox + :returns: **None** if up/down is pressed, otherwise invokes next handler """ global HISTORY_DICT @@ -382,16 +380,15 @@ def _handle_history_key(next_handler, backlog, textbox, key): def _handle_tab_completion(next_handler, tab_completion, textbox, key): """ - Handles tab completion. If the tab key is pressed, the current textbox - contents are checked for probable commands. + Allows user to tab complete commands if sufficient context is provided to + narrow to a single option. :param func next_handler: handler to invoke after this :param func tab_completion: function to suggest inputs to tab complete with :param Textbox textbox: current textbox context :param int key: key pressed - :returns: **None** when tab key is pressed or calls function to handle - history validation + :returns: **None** when tab is pressed, otherwise invokes next handler """ if key == 9: @@ -403,6 +400,7 @@ def _handle_tab_completion(next_handler, tab_completion, textbox, key): new_input = matches[0] elif len(matches) > 1: common_prefix = os.path.commonprefix(matches) + if common_prefix != current_contents: new_input = common_prefix diff --git a/test/subwindow.py b/test/subwindow.py index 559c451..2a03007 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -69,6 +69,7 @@ EXPECTED_SCROLLBAR_BOTTOM = """ """.strip() NO_OP_HANDLER = lambda key, textbox: None +DIMENSIONS = (40, 80) class TestCurses(unittest.TestCase): @@ -126,56 +127,53 @@ class TestCurses(unittest.TestCase): self.assertEqual(EXPECTED_SCROLLBAR_BOTTOM, test.render(_draw).content.strip()) def test_handle_key(self): - dimensions = (40, 80) - textbox = Mock() - textbox.win.getyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 27)) textbox = Mock() - textbox.win.getyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS textbox.win.move = Mock() - expected_call = call(dimensions[0], 0) + expected_call = call(DIMENSIONS[0], 0) nyx.curses._handle_key(textbox, curses.KEY_HOME) self.assertTrue(textbox.win.move.called) self.assertEquals(expected_call, textbox.win.move.call_args) textbox = Mock() - textbox.win.getyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS textbox.gather.return_value = 'Sample Text' textbox.win.move = Mock() - expected_call = call(*dimensions) + 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 + textbox.win.getyx.return_value = DIMENSIONS self.assertEqual(curses.ascii.BEL, nyx.curses._handle_key(textbox, 410)) textbox = Mock() - textbox.win.getyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS key_pressed = ord('a') self.assertEqual(key_pressed, nyx.curses._handle_key(textbox, key_pressed)) def test_handle_history_key(self): backlog = ['GETINFO version'] - dimensions = (40, 80) textbox = Mock() - textbox.win.getyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS self.assertIsNone(nyx.curses._handle_history_key(NO_OP_HANDLER, [], textbox, curses.KEY_UP)) textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.win.getmaxyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS + textbox.win.getmaxyx.return_value = DIMENSIONS textbox.win.addstr = Mock() textbox.win.move = Mock() nyx.curses._handle_history_key(NO_OP_HANDLER, backlog, textbox, curses.KEY_UP) self.assertTrue(textbox.win.clear.called) - expected_addstr_call = call(dimensions[0], 0, backlog[0]) + expected_addstr_call = call(DIMENSIONS[0], 0, backlog[0]) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) - expected_move_call = call(dimensions[0], len(backlog[0])) + expected_move_call = call(DIMENSIONS[0], len(backlog[0])) self.assertEqual(expected_move_call, textbox.win.move.call_args) textbox = Mock() @@ -185,19 +183,18 @@ class TestCurses(unittest.TestCase): @patch('nyx.curses._handle_history_key') def test_handle_tab_completion(self, mock_handle_history_key): - dimensions = (40, 80) tab_completion_content = 'GETINFO version' textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.win.getmaxyx.return_value = dimensions + textbox.win.getyx.return_value = DIMENSIONS + textbox.win.getmaxyx.return_value = DIMENSIONS textbox.win.addstr = Mock() textbox.win.move = Mock() tab_completion = Mock() tab_completion.return_value = [tab_completion_content] nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, textbox, 9) self.assertTrue(textbox.win.clear.called) - expected_addstr_call = call(dimensions[0], 0, tab_completion_content) + expected_addstr_call = call(DIMENSIONS[0], 0, tab_completion_content) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) - expected_move_call = call(dimensions[0], len(tab_completion_content)) + expected_move_call = call(DIMENSIONS[0], len(tab_completion_content)) self.assertTrue(expected_move_call, textbox.win.move.call_args)

1 0

[nyx/master] Interpreter constructed its own connection
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit eb28072d925b548913e17e3f7c7cb548395d6d29 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 21 09:45:27 2016 -0700 Interpreter constructed its own connection No, just no. >:( No clue why Sambuddha did this. Constructing a separate connection is bad for several reasons... 1. The interpreter only works if tor is running on the default port. Anything else and it's hosed. 2. The stem.connect() prints to stdout and gets passwords from stdin. That means nyx is completely hosed in several situations since we're in a curses context and that'll freeze or screw up our interface. 3. This second connection is completely pointless. Nyx has a controller connection - it's used everywhere. Why did this seem like a good idea? 4. It completely broke our tests if tor isn't presently running on the expected port. 5. If tor shuts down and is restarted this won't get the new connection when nyx reattaches. --- nyx/panel/interpreter.py | 14 +++++--------- test/panel/interpreter.py | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index dfd7480..7775028 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -13,10 +13,9 @@ 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 import panel +from nyx import tor_controller, panel import stem -import stem.connection import stem.interpreter.autocomplete import stem.interpreter.commands @@ -74,13 +73,10 @@ class InterpreterPanel(panel.Panel): self._x_offset = 0 self._scroller = nyx.curses.Scroller() self._backlog = [] - self.controller = stem.connection.connect( - control_port = ('127.0.0.1', 'default'), - control_socket = '/var/run/tor/control', - password_prompt = True, - ) - self.autocompleter = stem.interpreter.autocomplete.Autocompleter(self.controller) - self.interpreter = stem.interpreter.commands.ControlInterpretor(self.controller) + + 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)]] def key_handlers(self): diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index 5383777..8283c5e 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -8,6 +8,8 @@ import nyx.curses import nyx.panel.interpreter import test +from mock import patch + EXPECTED_PANEL = """ Control Interpreter: >>> to use this panel press enter @@ -57,20 +59,26 @@ class TestInterpreter(unittest.TestCase): self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) self.assertEqual(('/help', 'Magenta', 'Bold'), output[1]) - def test_rendering_panel(self): + @patch('nyx.panel.interpreter.tor_controller') + def test_rendering_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) - def test_rendering_multiline_panel(self): + @patch('nyx.panel.interpreter.tor_controller') + 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')]) self.assertEqual(EXPECTED_MULTILINE_PANEL, test.render(panel._draw).content) - def test_scrollbar(self): + @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) @@ -80,7 +88,9 @@ class TestInterpreter(unittest.TestCase): self.assertEqual(height, len(output_lines)) self.assertEqual(EXPECTED_SCROLLBAR_PANEL, output_lines[1]) - def test_key_handlers(self): + @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))

1 0

[nyx/master] Proper handler chaining
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit ec9788b0fbca919e250d4c7ce1dc10dc4c8e9fb5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:43:20 2016 -0700 Proper handler chaining Our tab completion handler was hardcoded to call the history handler. Fine if tab and history completion are always done together (as they are at the moment) but clearly a bug. Fixing this so any combination of handlers can be used. --- nyx/curses.py | 33 +++++++++++++++++++-------------- test/subwindow.py | 14 ++++++++------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 3767cd3..a6a8b2d 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -86,6 +86,7 @@ import collections import curses import curses.ascii import curses.textpad +import functools import os import threading @@ -280,12 +281,15 @@ def str_input(x, y, initial_text = '', backlog = None, tab_completion = None): curses_subwindow.addstr(0, 0, initial_text[:width - 1]) textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) - if tab_completion is not None: - user_input = textbox.edit(lambda key: _handle_tab_completion(textbox, key, backlog, tab_completion)).strip() - elif backlog is not None: - user_input = textbox.edit(lambda key: _handle_history_key(textbox, key, backlog)).strip() - else: - user_input = textbox.edit(lambda key: _handle_key(textbox, key)).strip() + handler = _handle_key + + if backlog: + handler = functools.partial(_handle_history_key, handler, backlog) + + if tab_completion: + handler = functools.partial(_handle_tab_completion, handler, tab_completion) + + user_input = textbox.edit(lambda key: handler(textbox, key)).strip() try: curses.curs_set(0) # hide cursor @@ -328,14 +332,15 @@ def _handle_key(textbox, key): return key -def _handle_history_key(textbox, key, backlog): +def _handle_history_key(next_handler, backlog, textbox, key): """ Handles history validation. When the up/down arrow keys are pressed, the relative previous/next commands are shown. + :param func next_handler: handler to invoke after this + :param list backlog: backlog of all previous commands entered :param Textbox textbox: current textbox context :param int key: key pressed - :param list backlog: backlog of all previous commands entered :returns: **None** if up/down arrow key is pressed or calls function to write key to the textbox @@ -370,19 +375,19 @@ def _handle_history_key(textbox, key, backlog): HISTORY_DICT['selection_index'] = new_selection return None - return _handle_key(textbox, key) + return next_handler(textbox, key) -def _handle_tab_completion(textbox, key, backlog, tab_completion): +def _handle_tab_completion(next_handler, tab_completion, textbox, key): """ Handles tab completion. If the tab key is pressed, the current textbox contents are checked for probable commands. - :param Textbox textbox: current textbox context - :param int key: key pressed - :param list backlog: backlog of all previous commands entered + :param func next_handler: handler to invoke after this :param Autocompleter.matches tab_completion: function to suggest probable commands based on current content + :param Textbox textbox: current textbox context + :param int key: key pressed :returns: **None** when tab key is pressed or calls function to handle history validation @@ -409,7 +414,7 @@ def _handle_tab_completion(textbox, key, backlog, tab_completion): return None - return _handle_history_key(textbox, key, backlog) + return next_handler(textbox, key) def curses_attr(*attributes): diff --git a/test/subwindow.py b/test/subwindow.py index 3f58278..559c451 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -68,6 +68,8 @@ EXPECTED_SCROLLBAR_BOTTOM = """ -+ """.strip() +NO_OP_HANDLER = lambda key, textbox: None + class TestCurses(unittest.TestCase): @require_curses @@ -156,21 +158,20 @@ class TestCurses(unittest.TestCase): key_pressed = ord('a') self.assertEqual(key_pressed, nyx.curses._handle_key(textbox, key_pressed)) - @patch('nyx.curses._handle_key') - def test_handle_history_key(self, mock_handle_key): + def test_handle_history_key(self): backlog = ['GETINFO version'] dimensions = (40, 80) textbox = Mock() textbox.win.getyx.return_value = dimensions - self.assertIsNone(nyx.curses._handle_history_key(textbox, curses.KEY_UP, [])) + self.assertIsNone(nyx.curses._handle_history_key(NO_OP_HANDLER, [], textbox, curses.KEY_UP)) textbox = Mock() textbox.win.getyx.return_value = dimensions textbox.win.getmaxyx.return_value = dimensions textbox.win.addstr = Mock() textbox.win.move = Mock() - nyx.curses._handle_history_key(textbox, curses.KEY_UP, backlog) + nyx.curses._handle_history_key(NO_OP_HANDLER, backlog, textbox, curses.KEY_UP) self.assertTrue(textbox.win.clear.called) expected_addstr_call = call(dimensions[0], 0, backlog[0]) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) @@ -178,7 +179,8 @@ class TestCurses(unittest.TestCase): self.assertEqual(expected_move_call, textbox.win.move.call_args) textbox = Mock() - nyx.curses._handle_history_key(textbox, curses.KEY_LEFT, []) + mock_handle_key = Mock() + nyx.curses._handle_history_key(mock_handle_key, [], textbox, curses.KEY_LEFT) self.assertTrue(mock_handle_key.called) @patch('nyx.curses._handle_history_key') @@ -193,7 +195,7 @@ class TestCurses(unittest.TestCase): textbox.win.move = Mock() tab_completion = Mock() tab_completion.return_value = [tab_completion_content] - nyx.curses._handle_tab_completion(textbox, 9, [], tab_completion) + nyx.curses._handle_tab_completion(NO_OP_HANDLER, tab_completion, textbox, 9) self.assertTrue(textbox.win.clear.called) expected_addstr_call = call(dimensions[0], 0, tab_completion_content) self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args)

1 0

[stem/master] Don't use stdout/stderr directly for python output
by atagar＠torproject.org 01 Aug '16

01 Aug '16

commit ae48d813dafcae8f46f50d35b758dd5287d178cf Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 31 15:59:47 2016 -0700 Don't use stdout/stderr directly for python output Python interpreter commands use the builtin InteactiveConsole which interacts with stdout and stderr directly. This isn't a problem for our tor-prompt since it writes to stdout anyway, but it breaks nyx. Nicest option I've found for this is... https://stackoverflow.com/questions/13250050/redirecting-the-output-of-a-py… --- stem/interpreter/commands.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 82a216d..e348c6e 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -6,7 +6,9 @@ Handles making requests and formatting the responses. """ import code +import contextlib import socket +import sys import stem import stem.control @@ -19,6 +21,11 @@ import stem.util.tor_tools from stem.interpreter import STANDARD_OUTPUT, BOLD_OUTPUT, ERROR_OUTPUT, uses_settings, msg from stem.util.term import format +try: + from cStringIO import StringIO +except ImportError: + from io import StringIO + def _get_fingerprint(arg, controller): """ @@ -84,6 +91,17 @@ def _get_fingerprint(arg, controller): raise ValueError("'%s' isn't a fingerprint, nickname, or IP address" % arg) +(a)contextlib.contextmanager +def redirect(stdout, stderr): + original = sys.stdout, sys.stderr + sys.stdout, sys.stderr = stdout, stderr + + try: + yield + finally: + sys.stdout, sys.stderr = original + + class ControlInterpreter(code.InteractiveConsole): """ Handles issuing requests and providing nicely formed responses, with support @@ -338,8 +356,13 @@ class ControlInterpreter(code.InteractiveConsole): is_tor_command = cmd in config.get('help.usage', {}) and cmd.lower() != 'events' if self._run_python_commands and not is_tor_command: - self.is_multiline_context = code.InteractiveConsole.push(self, command) - return + console_output = StringIO() + + with redirect(console_output, console_output): + self.is_multiline_context = code.InteractiveConsole.push(self, command) + + output = console_output.getvalue() + return output if output else None else: try: output = format(self._controller.msg(command).raw_content().strip(), *STANDARD_OUTPUT)

1 0

[stem/master] Correct 'interpretor' typos
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit e1cb6914c329ee3a562fc3cb756b240d02eb3fe1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 31 11:27:45 2016 -0700 Correct 'interpretor' typos Oops, we still had quite a few of these typos throughout our codebase. --- stem/interpreter/__init__.py | 2 +- stem/interpreter/commands.py | 4 ++-- stem/interpreter/settings.cfg | 2 +- test/settings.cfg | 2 +- test/unit/interpreter/commands.py | 24 ++++++++++++------------ test/unit/interpreter/help.py | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 5031900..f516565 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -122,7 +122,7 @@ def main(): readline.set_completer(autocompleter.complete) readline.set_completer_delims('\n') - interpreter = stem.interpreter.commands.ControlInterpretor(controller) + interpreter = stem.interpreter.commands.ControlInterpreter(controller) for line in msg('msg.startup_banner').splitlines(): line_format = HEADER_BOLD_OUTPUT if line.startswith(' ') else HEADER_OUTPUT diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 5c84723..82a216d 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -84,7 +84,7 @@ def _get_fingerprint(arg, controller): raise ValueError("'%s' isn't a fingerprint, nickname, or IP address" % arg) -class ControlInterpretor(code.InteractiveConsole): +class ControlInterpreter(code.InteractiveConsole): """ Handles issuing requests and providing nicely formed responses, with support for special irc style subcommands. @@ -295,7 +295,7 @@ class ControlInterpretor(code.InteractiveConsole): # Commands fall into three categories: # - # * Interpretor commands. These start with a '/'. + # * Interpreter commands. These start with a '/'. # # * Controller commands stem knows how to handle. We use our Controller's # methods for these to take advantage of caching and present nicer diff --git a/stem/interpreter/settings.cfg b/stem/interpreter/settings.cfg index 2739eec..1c6b27f 100644 --- a/stem/interpreter/settings.cfg +++ b/stem/interpreter/settings.cfg @@ -59,7 +59,7 @@ msg.starting_tor # Response for the '/help' command without any arguments. help.general -|Interpretor commands include: +|Interpreter commands include: | /help - provides information for interpreter and tor commands | /events - prints events that we've received | /info - general information for a relay diff --git a/test/settings.cfg b/test/settings.cfg index 10e2ccf..b7323ac 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -206,7 +206,7 @@ test.unit_tests |test.unit.interpreter.arguments.TestArgumentParsing |test.unit.interpreter.autocomplete.TestAutocompletion |test.unit.interpreter.help.TestHelpResponses -|test.unit.interpreter.commands.TestInterpretorCommands +|test.unit.interpreter.commands.TestInterpreterCommands |test.unit.doctest.TestDocumentation test.integ_tests diff --git a/test/unit/interpreter/commands.py b/test/unit/interpreter/commands.py index 1fe52f7..63fedc5 100644 --- a/test/unit/interpreter/commands.py +++ b/test/unit/interpreter/commands.py @@ -5,7 +5,7 @@ import stem import stem.response import stem.version -from stem.interpreter.commands import ControlInterpretor, _get_fingerprint +from stem.interpreter.commands import ControlInterpreter, _get_fingerprint from test import mocking from test.unit.interpreter import CONTROLLER @@ -40,7 +40,7 @@ EXPECTED_GETCONF_RESPONSE = """\ FINGERPRINT = '9695DFC35FFEB861329B9F1AB04C46397020CE31' -class TestInterpretorCommands(unittest.TestCase): +class TestInterpreterCommands(unittest.TestCase): def test_get_fingerprint_for_ourselves(self): controller = Mock() @@ -94,23 +94,23 @@ class TestInterpretorCommands(unittest.TestCase): controller = Mock() controller.is_alive.return_value = False - interpreter = ControlInterpretor(controller) + interpreter = ControlInterpreter(controller) self.assertRaises(stem.SocketClosed, interpreter.run_command, '/help') def test_quit(self): - interpreter = ControlInterpretor(CONTROLLER) + interpreter = ControlInterpreter(CONTROLLER) self.assertRaises(stem.SocketClosed, interpreter.run_command, '/quit') self.assertRaises(stem.SocketClosed, interpreter.run_command, 'QUIT') def test_help(self): - interpreter = ControlInterpretor(CONTROLLER) + interpreter = ControlInterpreter(CONTROLLER) - self.assertTrue('Interpretor commands include:' in interpreter.run_command('/help')) + self.assertTrue('Interpreter commands include:' in interpreter.run_command('/help')) self.assertTrue('Queries the tor process for information.' in interpreter.run_command('/help GETINFO')) self.assertTrue('Queries the tor process for information.' in interpreter.run_command('/help GETINFO version')) def test_events(self): - interpreter = ControlInterpretor(CONTROLLER) + interpreter = ControlInterpreter(CONTROLLER) # no received events @@ -157,11 +157,11 @@ class TestInterpretorCommands(unittest.TestCase): server_desc.tor_version = stem.version.Version('0.2.5.4-alpha-dev') server_desc.contact = '1024D/28988BF5 arma mit edu' - interpreter = ControlInterpretor(controller) + interpreter = ControlInterpreter(controller) self.assertTrue(interpreter.run_command('/info ' + FINGERPRINT).startswith(EXPECTED_INFO_RESPONSE)) def test_unrecognized_interpreter_command(self): - interpreter = ControlInterpretor(CONTROLLER) + interpreter = ControlInterpreter(CONTROLLER) expected = "\x1b[1;31m'/unrecognized' isn't a recognized command\x1b[0m\n" self.assertEqual(expected, interpreter.run_command('/unrecognized')) @@ -172,7 +172,7 @@ class TestInterpretorCommands(unittest.TestCase): controller = Mock() controller.msg.return_value = mocking.get_message(response) - interpreter = ControlInterpretor(controller) + interpreter = ControlInterpreter(controller) self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev (git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', interpreter.run_command('GETINFO version')) self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev (git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', interpreter.run_command('GETINFO version')) @@ -187,7 +187,7 @@ class TestInterpretorCommands(unittest.TestCase): controller = Mock() controller.msg.return_value = mocking.get_message(response) - interpreter = ControlInterpretor(controller) + interpreter = ControlInterpreter(controller) self.assertEqual('\x1b[34m250-Log=notice stdout\r\x1b[0m\n\x1b[34m250 Address\x1b[0m\n', interpreter.run_command('GETCONF log address')) controller.msg.assert_called_with('GETCONF log address') @@ -196,6 +196,6 @@ class TestInterpretorCommands(unittest.TestCase): controller = Mock() controller.msg.return_value = mocking.get_message('250 OK') - interpreter = ControlInterpretor(controller) + interpreter = ControlInterpreter(controller) self.assertEqual('\x1b[34m250 OK\x1b[0m\n', interpreter.run_command('SETEVENTS BW')) diff --git a/test/unit/interpreter/help.py b/test/unit/interpreter/help.py index 49df746..b37a09b 100644 --- a/test/unit/interpreter/help.py +++ b/test/unit/interpreter/help.py @@ -25,7 +25,7 @@ class TestHelpResponses(unittest.TestCase): def test_general_help(self): result = response(CONTROLLER, '') - self.assertTrue('Interpretor commands include:' in result) + self.assertTrue('Interpreter commands include:' in result) self.assertTrue('\x1b[34;1m GETINFO\x1b[0m\x1b[34m - queries information from tor\x1b[0m\n' in result) def test_getinfo_help(self):

1 0

[webwml/master] zooko.com is broken, link to https://en.wikipedia.org/wiki/Zooko%27s_triangle instead
by weasel＠torproject.org 31 Jul '16

31 Jul '16

commit 59126df8bc335a265e70a7e2d3cf0a94dfb2fc16 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 31 11:53:52 2016 +0200 zooko.com is broken, link to https://en.wikipedia.org/wiki/Zooko%27s_triangle instead --- docs/en/hidden-services.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/hidden-services.wml b/docs/en/hidden-services.wml index 1b4125b..bf9ae60 100644 --- a/docs/en/hidden-services.wml +++ b/docs/en/hidden-services.wml @@ -56,7 +56,7 @@ service name, it serves an important goal: Everyone – including the introduction points, the distributed hash table directory, and of course the clients – can verify that they are talking to the right hidden - service. See also <a href="http://zooko.com/distnames.html">Zooko's + service. See also <a href="https://en.wikipedia.org/wiki/Zooko%27s_triangle">Zooko's conjecture</a> that out of Decentralized, Secure, and Human-Meaningful, you can achieve at most two. Perhaps one day somebody will implement a <a href="http://www.skyhunter.com/marcs/petnames/IntroPetNames.html">Petname</a>

1 0

[stem/master] Format interpreter lines individually
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 7553e1e9d25c93de31981180800c3a1edea01aa4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 30 10:47:35 2016 -0700 Format interpreter lines individually Applying terminal formatting to each line of the tor output individually rather than the whole multi-line message. This doesn't matter for our interpreter, but makes the output much easier for nyx to work with. --- docs/change_log.rst | 1 + stem/interpreter/__init__.py | 10 +++++----- stem/util/term.py | 12 +++++++++++- test/unit/interpreter/commands.py | 5 +++-- test/unit/util/term.py | 2 ++ 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 839c7c9..4857b04 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -92,6 +92,7 @@ The following are only available within Stem's `git repository * Additional information when :func:`~stem.util.system.call` fails through a :class:`~stem.util.system.CallError` * Added **stem.util.system.SYSTEM_CALL_TIME** with the total time spent on system calls * Added an **is_ipv6** value to :class:`~stem.util.connection.Connection` instances + * Added LINES attribute to :data:`~stem.util.term.Attr` * Added :func:`~stem.util.system.pids_by_user` * Added :func:`~stem.util.connection.address_to_int` * Added :func:`~stem.util.term.encoding` diff --git a/stem/interpreter/__init__.py b/stem/interpreter/__init__.py index 0b24894..5031900 100644 --- a/stem/interpreter/__init__.py +++ b/stem/interpreter/__init__.py @@ -28,11 +28,11 @@ __all__ = [ PROMPT = format('>>> ', Color.GREEN, Attr.BOLD, Attr.READLINE_ESCAPE) -STANDARD_OUTPUT = (Color.BLUE, ) -BOLD_OUTPUT = (Color.BLUE, Attr.BOLD) -HEADER_OUTPUT = (Color.GREEN, ) -HEADER_BOLD_OUTPUT = (Color.GREEN, Attr.BOLD) -ERROR_OUTPUT = (Attr.BOLD, Color.RED) +STANDARD_OUTPUT = (Color.BLUE, Attr.LINES) +BOLD_OUTPUT = (Color.BLUE, Attr.BOLD, Attr.LINES) +HEADER_OUTPUT = (Color.GREEN, Attr.LINES) +HEADER_BOLD_OUTPUT = (Color.GREEN, Attr.BOLD, Attr.LINES) +ERROR_OUTPUT = (Attr.BOLD, Color.RED, Attr.LINES) settings_path = os.path.join(os.path.dirname(__file__), 'settings.cfg') uses_settings = stem.util.conf.uses_settings('stem_interpreter', settings_path) diff --git a/stem/util/term.py b/stem/util/term.py index a32fe93..1940b9e 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -33,6 +33,9 @@ Utilities for working with the terminal. Terminal text attributes. + .. versionchanged:: 1.5.0 + Added the LINES attribute. + =================== =========== Attr Description =================== =========== @@ -40,6 +43,7 @@ Utilities for working with the terminal. **HIGHLIGHT** inverted foreground and background **UNDERLINE** underlined text **READLINE_ESCAPE** wrap encodings in `RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE sequences <https://stackoverflow.com/questions/9468435/look-how-to-fix-column-calculat…>`_ + **LINES** formats lines individually =================== =========== """ @@ -55,7 +59,7 @@ DISABLE_COLOR_SUPPORT = False Color = stem.util.enum.Enum(*TERM_COLORS) BgColor = stem.util.enum.Enum(*['BG_' + color for color in TERM_COLORS]) -Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HIGHLIGHT', 'READLINE_ESCAPE') +Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HIGHLIGHT', 'READLINE_ESCAPE', 'LINES') # mappings of terminal attribute enums to their ANSI escape encoding FG_ENCODING = dict([(list(Color)[i], str(30 + i)) for i in range(8)]) @@ -123,6 +127,12 @@ def format(msg, *attr): if DISABLE_COLOR_SUPPORT: return msg + if Attr.LINES in attr: + attr = list(attr) + attr.remove(Attr.LINES) + lines = [format(line, *attr) for line in msg.split('\n')] + return '\n'.join(lines) + # if we have reset sequences in the message then apply our attributes # after each of them diff --git a/test/unit/interpreter/commands.py b/test/unit/interpreter/commands.py index 30407ba..1fe52f7 100644 --- a/test/unit/interpreter/commands.py +++ b/test/unit/interpreter/commands.py @@ -174,7 +174,8 @@ class TestInterpretorCommands(unittest.TestCase): interpreter = ControlInterpretor(controller) - self.assertEqual('\x1b[34m%s\x1b[0m\n' % response, interpreter.run_command('GETINFO version')) + self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev (git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', interpreter.run_command('GETINFO version')) + self.assertEqual('\x1b[34m250-version=0.2.5.1-alpha-dev (git-245ecfff36c0cecc)\r\x1b[0m\n\x1b[34m250 OK\x1b[0m\n', interpreter.run_command('GETINFO version')) controller.msg.assert_called_with('GETINFO version') controller.msg.side_effect = stem.ControllerError('kaboom!') @@ -188,7 +189,7 @@ class TestInterpretorCommands(unittest.TestCase): interpreter = ControlInterpretor(controller) - self.assertEqual('\x1b[34m%s\x1b[0m\n' % response, interpreter.run_command('GETCONF log address')) + self.assertEqual('\x1b[34m250-Log=notice stdout\r\x1b[0m\n\x1b[34m250 Address\x1b[0m\n', interpreter.run_command('GETCONF log address')) controller.msg.assert_called_with('GETCONF log address') def test_setevents(self): diff --git a/test/unit/util/term.py b/test/unit/util/term.py index 758db22..130b1ae 100644 --- a/test/unit/util/term.py +++ b/test/unit/util/term.py @@ -27,4 +27,6 @@ class TestTerminal(unittest.TestCase): self.assertEqual('hi!', stem.util.term.format('hi!')) self.assertEqual('\x1b[31mhi!\x1b[0m', stem.util.term.format('hi!', Color.RED)) self.assertEqual('\x1b[31;1mhi!\x1b[0m', stem.util.term.format('hi!', Color.RED, Attr.BOLD)) + self.assertEqual('\x1b[31mhi\nthere!\x1b[0m', stem.util.term.format('hi\nthere!', Color.RED)) + self.assertEqual('\x1b[31mhi\x1b[0m\n\x1b[31mthere!\x1b[0m', stem.util.term.format('hi\nthere!', Color.RED, Attr.LINES)) self.assertEqual('\001\x1b[31m\002hi!\001\x1b[0m\002', stem.util.term.format('hi!', Color.RED, Attr.READLINE_ESCAPE))

1 0

[tor-browser-bundle/master] Update Chaneglog and tor-browser version
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 8eca2970d9b1b3b4d071f4cb837e16d7637e83b9 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 11:56:37 2016 +0000 Update Chaneglog and tor-browser version --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0f089ec..eb79991 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -26,8 +26,10 @@ Tor Browser 6.5a2 -- August 3 * Bug 19735: Switch default search engine to DuckDuckGo * Windows * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x * Linux * Bug 19276: Disable Xrender due to possible performance regressions + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x * OS X * Bug 19269: Icon doesn't appear in Applications folder or Dock * Android diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 031a839..4be792f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.8.5-rc TORLAUNCHER_TAG=0.2.9.3 TORBUTTON_TAG=1.9.6.1

1 0