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

[nyx/master] Moving HALT_ACTIVITY to curses module
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 03820fcafbd30b8209e8aeadb3b68d6e0b330e1f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 08:57:19 2016 -0700 Moving HALT_ACTIVITY to curses module Flag is for preventing further curses activity so this is where it belongs. Expanding it to cover get_str() (... maybe that's why I've occasionally had nyx freeze?) and be covered by the curses lock. --- nyx/curses.py | 19 +++++++++++++++++++ nyx/panel/__init__.py | 8 ++------ nyx/starter.py | 3 +-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index ed8b87b..6e605a7 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 + halt - prevents further curses rendering during shutdown is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -99,6 +100,7 @@ from nyx import msg, log CURSES_SCREEN = None CURSES_LOCK = threading.RLock() +HALT_ACTIVITY = False # Text colors and attributes. These are *very* commonly used so including # shorter aliases (so they can be referenced as just GREEN or BOLD). @@ -283,6 +285,9 @@ def str_input(x, y, initial_text = ''): return key with CURSES_LOCK: + if HALT_ACTIVITY: + return None + try: curses.curs_set(1) # show cursor except curses.error: @@ -354,6 +359,17 @@ def screenshot(): return '\n'.join(lines).rstrip() +def halt(): + """ + Prevents further rendering of curses content while python's shutting down. + """ + + global HALT_ACTIVITY + + with CURSES_LOCK: + HALT_ACTIVITY = True + + def is_color_supported(): """ Checks if curses currently supports rendering colors. @@ -497,6 +513,9 @@ def draw(func, left = 0, top = 0, width = None, height = None, background = None """ with CURSES_LOCK: + if HALT_ACTIVITY: + return + dimensions = screen_size() subwindow_width = max(0, dimensions.width - left) subwindow_height = max(0, dimensions.height - top) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index b572d66..96a39bd 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -21,8 +21,6 @@ __all__ = [ 'torrc', ] -HALT_ACTIVITY = False # prevents curses redraws if set - class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current'])): """ @@ -157,10 +155,8 @@ class Panel(object): able (ie, the subwindow's unchanged), instead just refreshing the display. """ - # skipped if not currently visible or activity has been halted - - if not self._visible or HALT_ACTIVITY: - return + if not self._visible: + return # not currently visible nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) diff --git a/nyx/starter.py b/nyx/starter.py index b9df29a..5f89526 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -18,7 +18,6 @@ import nyx import nyx.arguments import nyx.controller import nyx.curses -import nyx.panel import nyx.tracker import stem @@ -95,7 +94,7 @@ def main(config): except KeyboardInterrupt: pass # skip printing a stack trace finally: - nyx.panel.HALT_ACTIVITY = True + nyx.curses.halt() _shutdown_daemons(controller)

1 0

[nyx/master] IPv6 addresses caused connection panel sorting to error
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 19b60afb3c008102e5d9bb4c04b44e0267e1e916 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 10:32:21 2016 -0700 IPv6 addresses caused connection panel sorting to error Our connection panel converts addresses to integers to sort its lines. This assumed addresses were IPv4, causing a stacktrace if you had connections to/from any IPv6 addresses. --- nyx/panel/connection.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index cac6490..afcf457 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -135,13 +135,9 @@ class Entry(object): if attr == SortAttr.IP_ADDRESS: if self.is_private(): return 255 ** 4 # orders at the end - - ip_value = 0 - - for octet in line.connection.remote_address.split('.'): - ip_value = ip_value * 255 + int(octet) - - return ip_value * 65536 + line.connection.remote_port + else: + address_int = connection.address_to_int(line.connection.remote_address) + return address_int * 65536 + line.connection.remote_port elif attr == SortAttr.PORT: return line.connection.remote_port elif attr == SortAttr.FINGERPRINT:

1 0

[nyx/master] Drop legacy draw methods
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 1191b1600e334f53aa81373b8a4a95cde0dd7f82 Merge: 8db8db6 f777422 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 10:02:24 2016 -0700 Drop legacy draw methods Now that we're using curses.py for rendering we can clean up our panel. Vastly simpler now. nyx/controller.py | 51 +++-- nyx/curses.py | 19 ++ nyx/menu.py | 16 +- nyx/panel/__init__.py | 536 ++++++------------------------------------------ nyx/panel/config.py | 14 +- nyx/panel/connection.py | 20 +- nyx/panel/graph.py | 30 +-- nyx/panel/header.py | 19 +- nyx/panel/log.py | 23 +-- nyx/panel/torrc.py | 14 +- nyx/starter.py | 3 +- test/panel/header.py | 3 +- test/panel/torrc.py | 8 +- 13 files changed, 198 insertions(+), 558 deletions(-)

1 0

[nyx/master] Drop get_width() method
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 537ca9dc3047a3fd0b29c669f6f60375ba7642d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 08:40:14 2016 -0700 Drop get_width() method Had it for symmetry with get_height() but was unused. The header and graph panels override get_height() so we still need that for the moment. --- nyx/controller.py | 5 ++++- nyx/panel/__init__.py | 30 ++++++++---------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index fc38185..c5b90d6 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -278,7 +278,10 @@ class Controller(object): for panel_impl in display_panels: panel_impl.set_top(occupied_content) - occupied_content += panel_impl.get_height() + height = panel_impl.get_height() + + if height: + occupied_content += height # apparently curses may cache display contents unless we explicitely # request a redraw here... diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 1d6ae9f..b572d66 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -71,11 +71,7 @@ class Panel(object): def __init__(self): self._visible = False - self._top = 0 - self._left = 0 - self._height = -1 - self._width = -1 def set_visible(self, is_visible): """ @@ -107,17 +103,12 @@ class Panel(object): def get_height(self): """ - Provides the height used for subwindows (-1 if it isn't limited). - """ + Provides the height used by this panel. - return self._height - - def get_width(self): - """ - Provides the width used for subwindows (-1 if it isn't limited). + :returns: **int** for the height of the panel or **None** if unlimited """ - return self._width + return None def get_preferred_size(self): """ @@ -129,15 +120,13 @@ class Panel(object): with nyx.curses.raw_screen() as stdscr: new_height, new_width = stdscr.getmaxyx() - set_height, set_width = self.get_height(), self.get_width() new_height = max(0, new_height - self._top) - new_width = max(0, new_width - self._left) + new_width = max(0, new_width) - if set_height != -1: - new_height = min(new_height, set_height) + set_height = self.get_height() - if set_width != -1: - new_width = min(new_width, set_width) + if set_height is not None: + new_height = min(new_height, set_height) return (new_height, new_width) @@ -173,10 +162,7 @@ class Panel(object): if not self._visible or HALT_ACTIVITY: return - height = self.get_height() if self.get_height() != -1 else None - width = self.get_width() if self.get_width() != -1 else None - - nyx.curses.draw(self.draw, top = self._top, width = width, height = height) + nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) class DaemonPanel(Panel, threading.Thread):

1 0

[nyx/master] Combine get_height() and get_preferred_size()
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit f777422689c02f289b65a2bfd8629fed5d09cbb4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 09:59:35 2016 -0700 Combine get_height() and get_preferred_size() Our get_height() provided our maximum height while get_preferred_size() provided our actual dimensions. On reflection both of these were dumb... * We never care about our maximum height except to calculate our real dimensions. * We never care about our width so get_preferred_size() was really just providing our height. So combining these into a single get_height() method that provides our actual height. Much simpler. --- nyx/panel/__init__.py | 26 ++------------------------ nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 4 +++- nyx/panel/header.py | 6 ++++-- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- 7 files changed, 13 insertions(+), 31 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index bfc4e6c..85d1b78 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -22,7 +22,6 @@ Panels consisting the nyx interface. | |- set_visible - toggles panel visiblity |- key_handlers - keyboard input accepted by the panel - |- get_preferred_size - dimensions when rendered +- redraw - renders the panel content """ @@ -113,10 +112,10 @@ class Panel(object): """ Provides the height occupied by this panel. - :returns: **int** for the height of the panel or **None** if unlimited + :returns: **int** for the height of the panel """ - return None + return max(0, nyx.curses.screen_size().height - self._top) def set_visible(self, is_visible): """ @@ -136,27 +135,6 @@ class Panel(object): return () - def get_preferred_size(self): - """ - Provides the dimensions the subwindow would use when next redrawn if none - of its properties change. - - :returns: **tuple** of the form **(height, width)** - """ - - with nyx.curses.raw_screen() as stdscr: - new_height, new_width = stdscr.getmaxyx() - - new_height = max(0, new_height - self._top) - new_width = max(0, new_width) - - set_height = self.get_height() - - if set_height is not None: - new_height = min(new_height, set_height) - - return (new_height, new_width) - def redraw(self): """ Renders our panel's content to the screen. diff --git a/nyx/panel/config.py b/nyx/panel/config.py index f5d9dd9..7640b99 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -200,7 +200,7 @@ class ConfigPanel(nyx.panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT + page_height = self.get_height() - DETAILS_HEIGHT is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) if is_changed: diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 497df5c..cac6490 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -314,7 +314,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 if self._show_details: page_height -= (DETAILS_HEIGHT + 1) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 4a4e125..9dd3244 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -478,6 +478,8 @@ class GraphPanel(nyx.panel.Panel): Provides the height of the content. """ + max_height = nyx.panel.Panel.get_height(self) + if not self.displayed_stat: return 0 @@ -488,7 +490,7 @@ class GraphPanel(nyx.panel.Panel): if self.displayed_stat == GraphStat.BANDWIDTH and accounting_stats: height += 3 - return height + return min(max_height, height) def set_graph_height(self, new_graph_height): self._graph_height = max(1, new_graph_height) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 31f9970..f08afd7 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -90,10 +90,12 @@ class HeaderPanel(nyx.panel.DaemonPanel): panel's maximum width. """ + max_height = nyx.panel.DaemonPanel.get_height(self) + if self._vals.is_relay: - return 5 if self.is_wide() else 7 + return min(max_height, 5 if self.is_wide() else 7) else: - return 4 if self.is_wide() else 5 + return min(max_height, 4 if self.is_wide() else 5) def send_newnym(self): """ diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 2eac0b5..0437e0f 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -207,7 +207,7 @@ class LogPanel(nyx.panel.DaemonPanel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index dfe331d..3682f7f 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -90,7 +90,7 @@ class TorrcPanel(panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed:

1 0

[nyx/master] Panel pydocs
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit a4ca8e7b00b7c249699e7388c4fb8711afe66638 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 09:46:44 2016 -0700 Panel pydocs Proper sphinx pydocs for the panel module. --- nyx/panel/__init__.py | 108 +++++++++++++++++++++++++++--------------------- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- test/panel/header.py | 2 +- test/panel/torrc.py | 8 ++-- 9 files changed, 72 insertions(+), 58 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 96a39bd..bfc4e6c 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -3,6 +3,27 @@ """ Panels consisting the nyx interface. + +**Module Overview:** + +:: + + KeyHandler - keyboard input a panel accepts + +- handle - triggers the keyboard action + + Panel - panel within the interface + |- DaemonPanel - panel that triggers actions at a set rate + | |- run - starts triggering daemon actions + | +- stop - stops triggering daemon actions + | + |- get_top - top position we're rendered into on the screen + |- set_top - sets top position within the screen + |- get_height - height occupied by the panel + | + |- set_visible - toggles panel visiblity + |- key_handlers - keyboard input accepted by the panel + |- get_preferred_size - dimensions when rendered + +- redraw - renders the panel content """ import collections @@ -63,56 +84,64 @@ class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current' class Panel(object): """ - Common parent for interface panels, providing the ability to pause and - configure dimensions. + Panel within the nyx interface. """ def __init__(self): - self._visible = False self._top = 0 - - def set_visible(self, is_visible): - """ - Toggles if the panel is visible or not. - - Arguments: - is_visible - panel is redrawn when requested if true, skipped otherwise - """ - - self._visible = is_visible + self._visible = False def get_top(self): """ - Provides the top position used for subwindows. + Provides our top position in the overall screen. + + :returns: **int** with the top coordinate """ return self._top def set_top(self, top): """ - Changes the position where subwindows are placed within its parent. + Changes the position where we're rendered in the screen. - Arguments: - top - positioning of top within parent + :param int top: top position within the sceen """ - if self._top != top: - self._top = top + self._top = top def get_height(self): """ - Provides the height used by this panel. + Provides the height occupied by this panel. :returns: **int** for the height of the panel or **None** if unlimited """ return None + def set_visible(self, is_visible): + """ + Toggles if the panel is visible or not. + + :param bool is_visible: shows panel if **True**, hides otherwise + """ + + self._visible = is_visible + + def key_handlers(self): + """ + Provides keyboard input this panel supports. + + :returns: **tuple** of :class:`~nyx.panel.KeyHandler` instances + """ + + return () + def get_preferred_size(self): """ - Provides the dimensions the subwindow would use when next redrawn, given - that none of the properties of the panel or parent change before then. This - returns a tuple of (height, width). + Provides the dimensions the subwindow would use when next redrawn if none + of its properties change. + + :returns: **tuple** of the form **(height, width)** """ with nyx.curses.raw_screen() as stdscr: @@ -128,40 +157,25 @@ class Panel(object): return (new_height, new_width) - def key_handlers(self): - """ - Provides options this panel supports. This is a tuple of - :class:`~nyx.panel.KeyHandler` instances. - """ - - return () - - def draw(self, subwindow): - """ - Draws display's content. This is meant to be overwritten by - implementations and not called directly (use redraw() instead). The - dimensions provided are the drawable dimensions, which in terms of width is - a column less than the actual space. - - Arguments: - subwindow - window content is drawn into - """ - - pass - def redraw(self): """ - Clears display and redraws its content. This can skip redrawing content if - able (ie, the subwindow's unchanged), instead just refreshing the display. + Renders our panel's content to the screen. """ if not self._visible: return # not currently visible - nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) + nyx.curses.draw(self._draw, top = self._top, height = self.get_height()) + + def _draw(self, subwindow): + pass class DaemonPanel(Panel, threading.Thread): + """ + Panel that triggers its _update() method at a set rate. + """ + def __init__(self, update_rate): Panel.__init__(self) threading.Thread.__init__(self) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index cbbaa92..f5d9dd9 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -240,7 +240,7 @@ class ConfigPanel(nyx.panel.Panel): nyx.panel.KeyHandler('s', 'sort ordering', self.show_sort_dialog), ) - def draw(self, subwindow): + def _draw(self, subwindow): contents = self._get_config_options() selected, scroll = self._scroller.selection(contents, subwindow.height - DETAILS_HEIGHT) is_scrollbar_visible = len(contents) > subwindow.height - DETAILS_HEIGHT diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index bd78a9b..497df5c 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -400,7 +400,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): return tuple(options) - def draw(self, subwindow): + def _draw(self, subwindow): controller = tor_controller() nyx_controller = nyx.controller.get_controller() entries = self._entries diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e5f9cc7..4a4e125 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -557,7 +557,7 @@ class GraphPanel(nyx.panel.Panel): self._accounting_stats_paused = copy.copy(self._accounting_stats) self._stats_paused = dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) - def draw(self, subwindow): + def _draw(self, subwindow): if not self.displayed_stat: return diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 5f33f4f..31f9970 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -141,7 +141,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): nyx.panel.KeyHandler('r', action = _reconnect), ) - def draw(self, subwindow): + def _draw(self, subwindow): vals = self._vals # local reference to avoid concurrency concerns self._last_width = subwindow.width is_wide = self.is_wide() diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 02cd7fe..2eac0b5 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -250,7 +250,7 @@ class LogPanel(nyx.panel.DaemonPanel): if is_pause: self._event_log_paused = self._event_log.clone() - def draw(self, subwindow): + def _draw(self, subwindow): scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) nyx_controller = nyx.controller.get_controller() diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 6927e0c..dfe331d 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -108,7 +108,7 @@ class TorrcPanel(panel.Panel): nyx.panel.KeyHandler('l', 'line numbering', _toggle_line_numbers, 'on' if self._show_line_numbers else 'off'), ) - def draw(self, subwindow): + def _draw(self, subwindow): scroll = self._scroller.location(self._last_content_height - 1, subwindow.height - 1) if self._torrc_content is None: diff --git a/test/panel/header.py b/test/panel/header.py index c14b404..2951747 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -79,7 +79,7 @@ class TestHeaderPanel(unittest.TestCase): sampling_mock.return_value = test_sampling() panel = nyx.panel.header.HeaderPanel() - self.assertEqual(EXPECTED_PANEL, test.render(panel.draw).content) + self.assertEqual(EXPECTED_PANEL, test.render(panel._draw).content) @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') diff --git a/test/panel/torrc.py b/test/panel/torrc.py index 96d222c..732ec63 100644 --- a/test/panel/torrc.py +++ b/test/panel/torrc.py @@ -54,7 +54,7 @@ class TestGraphPanel(unittest.TestCase): @patch('nyx.panel.torrc.tor_controller', Mock()) def test_draw_with_content(self): panel = nyx.panel.torrc.TorrcPanel() - self.assertEqual(RENDERED_DEFAULT, test.render(panel.draw).content) + self.assertEqual(RENDERED_DEFAULT, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) @@ -63,7 +63,7 @@ class TestGraphPanel(unittest.TestCase): def test_draw_without_comments(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_comments = False - self.assertEqual(RENDERED_WITHOUT_COMMENTS, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITHOUT_COMMENTS, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) @@ -72,7 +72,7 @@ class TestGraphPanel(unittest.TestCase): def test_draw_without_line_numbers(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_line_numbers = False - self.assertEqual(RENDERED_WITHOUT_LINE_NUMBERS, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITHOUT_LINE_NUMBERS, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(side_effect = IOError("[Errno 2] No such file or directory: '/path/to/torrc'"))) @@ -81,4 +81,4 @@ class TestGraphPanel(unittest.TestCase): def test_draw_with_error(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_line_numbers = False - self.assertEqual(RENDERED_WITH_ERROR, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITH_ERROR, test.render(panel._draw).content)

1 0

[stem/master] Add stem.util.connection.address_to_int()
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit fd507a61eea24b99c260fc47552279f9deba6f18 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 10:29:08 2016 -0700 Add stem.util.connection.address_to_int() Couple times now I've needed to be able to serialize an IP address into an int. Might as well finally add a function for this. This can be used for realization if we had the other counterpart (int_to_address()), but not something I need right now. --- docs/change_log.rst | 1 + stem/exit_policy.py | 4 ++-- stem/util/connection.py | 20 ++++++++++++++++++++ test/unit/util/connection.py | 11 +++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 12764e8..98dc18c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -93,6 +93,7 @@ The following are only available within Stem's `git repository * 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 :func:`~stem.util.system.pids_by_user` + * Added :func:`~stem.util.connection.address_to_int` * Added :func:`~stem.util.__init__.datetime_to_unix` * **Interpreter** diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 9379d9c..df6809f 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -765,7 +765,7 @@ class ExitPolicyRule(object): if address is None: fuzzy_match = True else: - comparison_addr_bin = int(stem.util.connection._get_address_binary(address), 2) + comparison_addr_bin = stem.util.connection.address_to_int(address) comparison_addr_bin &= self._get_mask_bin() if self._get_address_bin() != comparison_addr_bin: @@ -907,7 +907,7 @@ class ExitPolicyRule(object): def _get_address_bin(self): # provides an integer representation of our address - return int(stem.util.connection._get_address_binary(self.address), 2) & self._get_mask_bin() + return stem.util.connection.address_to_int(self.address) & self._get_mask_bin() def _apply_addrspec(self, rule, addrspec, is_ipv6_only): # Parses the addrspec... diff --git a/stem/util/connection.py b/stem/util/connection.py index 49a410b..a375a17 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -17,6 +17,8 @@ Connection and networking based utility functions. is_valid_port - checks if something is a valid representation for a port is_private_address - checks if an IPv4 address belongs to a private range or not + address_to_int - provides an integer representation of an IP address + expand_ipv6_address - provides an IPv6 address with its collapsed portions expanded get_mask_ipv4 - provides the mask representation for a given number of bits get_mask_ipv6 - provides the IPv6 mask representation for a given number of bits @@ -523,6 +525,24 @@ def is_private_address(address): return False +def address_to_int(address): + """ + Provides an integer representation of a IPv4 or IPv6 address that can be used + for sorting. + + .. versionadded:: 1.5.0 + + :param str address: IPv4 or IPv6 address + + :returns: **int** representation of the address + """ + + # TODO: Could be neat to also use this for serialization if we also had an + # int_to_address() function. + + return int(_get_address_binary(address), 2) + + def expand_ipv6_address(address): """ Expands abbreviated IPv6 addresses to their full colon separated hex format. diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index e645c72..14d19a2 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -494,6 +494,17 @@ class TestConnection(unittest.TestCase): self.assertRaises(ValueError, stem.util.connection.is_private_address, '127.0.0') self.assertRaises(ValueError, stem.util.connection.is_private_address, 'fe80:0000:0000:0000:0202:b3ff:fe1e:8329') + def test_address_to_int(self): + """ + Checks the address_to_int function. + """ + + self.assertEqual(1, stem.util.connection.address_to_int('0.0.0.1')) + self.assertEqual(2, stem.util.connection.address_to_int('0.0.0.2')) + self.assertEqual(256, stem.util.connection.address_to_int('0.0.1.0')) + self.assertEqual(2130706433, stem.util.connection.address_to_int('127.0.0.1')) + self.assertEqual(338288524927261089654163772891438416681L, stem.util.connection.address_to_int('fe80:0000:0000:0000:0202:b3ff:fe1e:8329')) + def test_expand_ipv6_address(self): """ Checks the expand_ipv6_address function.

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 15 Jul '16

15 Jul '16

commit a44557bf4aa14df8ee910d5217e7b5cab8bd823b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 15 16:17:06 2016 +0000 Update translations for torbutton-aboutdialogdtd --- ta/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/aboutdialog.dtd b/ta/aboutdialog.dtd index 36e023f..25f39f2 100644 --- a/ta/aboutdialog.dtd +++ b/ta/aboutdialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; செய்தவர்">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online.">

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Jul '16

15 Jul '16

commit fd6bcc0b05115516c65566d46bb4c4a93479bb2a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 15 16:15:33 2016 +0000 Update translations for liveusb-creator --- ta/ta.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ta/ta.po b/ta/ta.po index 881b438..6eba4ef 100644 --- a/ta/ta.po +++ b/ta/ta.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Ephraim Raj <ephraimraj11299(a)gmail.com>, 2016 # git12a <git12(a)openmailbox.org>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-15 15:49+0000\n" +"Last-Translator: Ephraim Raj <ephraimraj11299(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -240,7 +241,7 @@ msgstr "" #: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" -msgstr "" +msgstr "LiveUSB செய்ய முடியவில்லை" #: ../liveusb/creator.py:1408 msgid "" @@ -601,7 +602,7 @@ msgstr "" #: ../liveusb/creator.py:95 msgid "You must run this application as root" -msgstr "" +msgstr "நீங்கள் இந்த பயன்பாட்டை root இயக்க வேண்டும" #: ../liveusb/dialog.py:162 msgid "or"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Jul '16

15 Jul '16

commit 8f96ec6a1e2265660910d173ee009ce6a7a2d1b9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 15 15:46:22 2016 +0000 Update translations for tails-misc --- ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta.po b/ta.po index 9de886d..daacd25 100644 --- a/ta.po +++ b/ta.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-06 14:26+0200\n" -"PO-Revision-Date: 2016-07-14 12:02+0000\n" +"PO-Revision-Date: 2016-07-15 15:39+0000\n" "Last-Translator: Ephraim Raj <ephraimraj11299(a)gmail.com>\n" "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n" "MIME-Version: 1.0\n" @@ -252,7 +252,7 @@ msgstr "மறுதுவக்கு" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 msgid "Power Off" -msgstr "" +msgstr "அனைத்து விடு" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available"

1 0