October 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 04d4786cc40b2d80b4cd34e7d5339b0100861c8f Merge: 151d5eded c50c98ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:07 2017 -0400 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 04d4786cc40b2d80b4cd34e7d5339b0100861c8f Merge: 151d5eded c50c98ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:07 2017 -0400 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a Merge: 6ce8cc5db 04d4786cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e Merge: 5bee5fbac 5a21b2708 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a Merge: 6ce8cc5db 04d4786cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit a99ca9313a501f30588a9bdee4034eec6fa3cf23 Merge: dbd4b2be5 7c59c751b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[nyx/master] Fix typo in sqlite3 import message
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 052851bb00c01329fd5d3aba5b9cefbf6c572e7a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 16:32:57 2017 -0700 Fix typo in sqlite3 import message Caught thanks to Andrew. --- nyx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 69c8099..0142c5d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -60,7 +60,7 @@ import stem.util.system import stem.util.tor_tools SQLITE_UNAVAILABLE = """\ -Python's sqlite3 module is unavailable. Unfortunatley some platforms +Python's sqlite3 module is unavailable. Unfortunately some platforms don't bundle this with the interpreter. Please let us know at... https://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs

1 0

[nyx/master] Be more selective with os.putenv exception suppresison
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 68f6f573fdac44fd9423e965d05ad253f0c64355 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 16:34:36 2017 -0700 Be more selective with os.putenv exception suppresison --- nyx/starter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/starter.py b/nyx/starter.py index 6f90bfd..2532a4a 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -89,12 +89,12 @@ def main(config): try: os.putenv('LANG', 'C') # make subcommands (ps, netstat, etc) provide english results - except: + except OSError: pass try: os.putenv('ESCDELAY', '0') # make 'esc' take effect right away - except: + except OSError: pass try:

1 0

[nyx/master] Refresh background when transversing menu
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit 698f095233e2432accdac15e3e0a749c7d4d49d2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 16:25:16 2017 -0700 Refresh background when transversing menu When displaying the menu we didn't redraw the background, causing old submenus to remain visible while moving around. --- nyx/menu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/menu.py b/nyx/menu.py index 580687e..80fdc81 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -210,7 +210,7 @@ def show_menu(): selection_x = _draw_top_menubar(menu, cursor.selection) _draw_submenu(cursor.selection, cursor.selection.submenu, 1, selection_x) cursor.handle_key(nyx.curses.key_input()) - nyx_interface().redraw() + nyx_interface().redraw(True) show_message()

1 0

[nyx/master] Stacktrace when transversing the menu on Gentoo
by atagar＠torproject.org 30 Oct '17

30 Oct '17

commit b4989bf41ec6613575366b3cbabd4a1dae630fd3 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 30 16:27:49 2017 -0700 Stacktrace when transversing the menu on Gentoo Interesting catch from Toralf. I'm not entirely sure if this is it but if he was using python3 it makes sense that keys() provides an iterator whereas reversed() expects a collection. Not able to repro it though so not sure if this is what's at play... Traceback (most recent call last): File "./run_nyx", line 14, in <module> nyx.main() File "/root/nyx/nyx/__init__.py", line 147, in main nyx.starter.main() File "/root/nyx/stem/util/conf.py", line 289, in wrapped return func(*args, config = config, **kwargs) File "/root/nyx/nyx/starter.py", line 94, in main nyx.curses.start(nyx.draw_loop, acs_support = config.get('acs_support', True), transparent_background = True, cursor = False) File "/root/nyx/nyx/curses.py", line 216, in start curses.wrapper(_wrapper) File "/usr/lib64/python3.4/curses/__init__.py", line 94, in wrapper return func(stdscr, *args, **kwds) File "/root/nyx/nyx/curses.py", line 214, in _wrapper function() File "/root/nyx/nyx/__init__.py", line 192, in draw_loop nyx.menu.show_menu() File "/root/nyx/nyx/menu.py", line 203, in show_menu menu = _make_menu() File "/root/nyx/nyx/menu.py", line 243, in _make_menu submenu = panel.submenu() File "/root/nyx/nyx/panel/log.py", line 273, in submenu [RadioMenuItem(opt, filter_group, opt) for opt in self._filter.latest_selections()], File "/root/nyx/nyx/log.py", line 432, in latest_selections return list(reversed(self._past_filters.keys())) TypeError: argument to reversed() must be a sequence --- nyx/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/log.py b/nyx/log.py index f1a4ff0..a3ad194 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -429,7 +429,7 @@ class LogFilters(object): return self._selected def latest_selections(self): - return list(reversed(self._past_filters.keys())) + return list(reversed(list(self._past_filters.keys()))) def match(self, message): regex_filter = self._past_filters.get(self._selected)

1 0