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

[nyx/master] Replace references to a nyxrc
by atagar＠torproject.org 29 Oct '20

29 Oct '20

commit 319f1348f28a226f287b96ea3f1f2e698612b8b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 28 17:10:35 2020 -0700 Replace references to a nyxrc Back in our old 'arm' days users could configure us through a file at ~/.armrc. Nyx changed this location to ~/.nyx/config but continued to call it a 'nyxrc'. Caught thanks to Sai... https://github.com/torproject/nyx/pull/27 Mostly this changes internal references, but there are two user visible changes... * This fixes our FAQ which incorrectly said that we read from ~/.nyx/nyxrc. * Removes the sample nyxrc path from our man page. Our setup.py no longer installs such a file. This intentionally keeps two references to a nyxrc... * Our website's url for a sample is... https://nyx.torproject.org/nyxrc.sample We can't change this prior to our next release without confusing users. * Our legacy changelog entries still call it a nyxrc because that's what it was called back then. --- nyx.1 | 4 ---- nyx/panel/torrc.py | 5 ++--- nyx/starter.py | 24 +++++++++++++----------- test/panel/log.py | 14 +++++++------- web/index.html | 36 ++++++++++++++++++------------------ web/styles.css | 10 +++++----- 6 files changed, 45 insertions(+), 48 deletions(-) diff --git a/nyx.1 b/nyx.1 index f779372..95e8df6 100644 --- a/nyx.1 +++ b/nyx.1 @@ -56,10 +56,6 @@ provides usage information \fB~/.nyx/config\fR Your personal nyx configuration file -.TP -\fB/usr/share/doc/nyx/nyxrc.sample\fR -Sample nyxrc configuration file that documents all options - .SH AUTHOR Written by Damian Johnson (atagar(a)torproject.org) diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 8f4a530..5efa2d4 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -2,7 +2,7 @@ # See LICENSE for licensing information """ -Panel displaying the torrc or nyxrc with the validation done against it. +Panel displays our syntax highlighted torrc. """ import functools @@ -32,8 +32,7 @@ def _read_torrc(path): class TorrcPanel(panel.Panel): """ - Renders the current torrc or nyxrc with syntax highlighting in a scrollable - area. + Renders our syntax highlighted torrc within a scrollable area. """ def __init__(self): diff --git a/nyx/starter.py b/nyx/starter.py index be904fd..547ba5c 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -32,8 +32,8 @@ Stem Version: {stem_version} Python Version: {python_version} Platform: {system} -------------------------------------------------------------------------------- -Nyx Configuration ({nyxrc_path}): -{nyxrc_content} +Nyx Configuration ({nyx_config_path}): +{nyx_config_content} -------------------------------------------------------------------------------- """.strip() @@ -77,9 +77,11 @@ def main(config): except IOError as exc: stem.util.log.warn('Failed to load configuration (using defaults): "%s"' % exc.strerror) else: - stem.util.log.notice('No nyxrc loaded, using defaults. You can customize nyx by placing a configuration file at %s (see https://nyx.torproject.org/nyxrc.sample for its options).' % args.config) + # TODO: move this url to 'nyx_config.sample' when we're about to issue another release - # If a password is provided via the user's nyxrc that will be use, otherwise + stem.util.log.notice('No nyx configuration loaded, using defaults. You can customize nyx by placing a configuration file at %s (see https://nyx.torproject.org/nyxrc.sample for its options).' % args.config) + + # If a password is provided via the user's nyx configuration that will be use, otherwise # users are prompted for a password if required. controller_password = config.get('password', None) @@ -156,22 +158,22 @@ def _setup_debug_logging(args): logger = stem.util.log.get_logger() logger.addHandler(debug_handler) - nyxrc_content = "[file doesn't exist]" + nyx_config_content = "[file doesn't exist]" if os.path.exists(args.config): try: - with open(args.config) as nyxrc_file: - nyxrc_content = nyxrc_file.read() + with open(args.config) as nyx_config_file: + nyx_config_content = nyx_config_file.read() except IOError as exc: - nyxrc_content = '[unable to read file: %s]' % exc.strerror + nyx_config_content = '[unable to read file: %s]' % exc.strerror stem.util.log.trace(DEBUG_HEADER.format( nyx_version = nyx.__version__, stem_version = stem.__version__, python_version = '.'.join(map(str, sys.version_info[:3])), system = platform.system(), - nyxrc_path = args.config, - nyxrc_content = nyxrc_content, + nyx_config_path = args.config, + nyx_config_content = nyx_config_content, )) @@ -201,7 +203,7 @@ def _warn_if_unable_to_get_pid(controller): @uses_settings def _warn_about_unused_config_keys(config): """ - Provides a notice if the user's nyxrc has any entries that are unused. + Provides a notice if the user's nyx configuration has any entries that are unused. """ for key in sorted(config.unused_keys()): diff --git a/test/panel/log.py b/test/panel/log.py index a05ed4f..bb27ef7 100644 --- a/test/panel/log.py +++ b/test/panel/log.py @@ -25,9 +25,9 @@ EXPECTED_WRAPPED_MSG = """\ EXPECTED_ENTRIES = """\ 16:41:37 [NYX_WARNING] Tor's geoip database is unavailable. - 16:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx by - placing a configuration file at /home/atagar/.nyx/nyxrc (see the nyxrc.sample - for its options). + 16:41:37 [NYX_NOTICE] No nyx configuration loaded, using defaults. You can + customize nyx by placing a configuration file at /home/atagar/.nyx/config + (see https://nyx.torproject.org/nyxrc.sample for its options). 16:41:37 [NOTICE] New control connection opened from 127.0.0.1. 16:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 16:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 @@ -41,9 +41,9 @@ EXPECTED_ENTRIES = """\ EXPECTED_ENTRIES_WITH_BORDER = """\ +-October 26, 2011-------------------------------------------------------------+ |16:41:37 [NYX_WARNING] Tor's geoip database is unavailable. | -|16:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx | -| by placing a configuration file at /home/atagar/.nyx/nyxrc (see the | -| nyxrc.sample for its options). | +|16:41:37 [NYX_NOTICE] No nyx configuration loaded, using defaults. You can | +| customize nyx by placing a configuration file at /home/atagar/.nyx/config | +| (see https://nyx.torproject.org/nyxrc.sample for its options). | |16:41:37 [NOTICE] New control connection opened from 127.0.0.1. | |16:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 | |16:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 | @@ -62,7 +62,7 @@ TIME_STRUCT = time.gmtime(NOW) def entries(): return [ LogEntry(NOW, 'NYX_WARNING', "Tor's geoip database is unavailable."), - LogEntry(NOW, 'NYX_NOTICE', 'No nyxrc loaded, using defaults. You can customize nyx by placing a configuration file at /home/atagar/.nyx/nyxrc (see the nyxrc.sample for its options).'), + LogEntry(NOW, 'NYX_NOTICE', 'No nyx configuration loaded, using defaults. You can customize nyx by placing a configuration file at /home/atagar/.nyx/config (see https://nyx.torproject.org/nyxrc.sample for its options).'), LogEntry(NOW, 'NOTICE', 'New control connection opened from 127.0.0.1.'), LogEntry(NOW, 'NOTICE', 'Opening OR listener on 0.0.0.0:7000'), LogEntry(NOW, 'NOTICE', 'Opening Control listener on 127.0.0.1:9051'), diff --git a/web/index.html b/web/index.html index adfadb5..7ef511b 100644 --- a/web/index.html +++ b/web/index.html @@ -275,7 +275,7 @@ E: Unable to locate package nyx</pre> <span>Is bandwidth graphed in bits or bytes?</span> <div class="answer"> <p><b>Bytes</b>. Most tools measure in bytes so for consistency we do the same. Unfortunately hosting providers advertise in bits to inflate their numbers ("5 Mbit connection"). If graphs show just one eighth of what you expect this is why.</p> - <p>To graph in bits rather than bytes add the following to your <a href="#configuration">nyxrc</a>...</p> + <p>To graph in bits rather than bytes add the following to your <a href="#configuration">nyx configuration</a>...</p> <pre>show_bits true</pre> </div> </li> @@ -285,7 +285,7 @@ E: Unable to locate package nyx</pre> <div class="answer"> <a class="acs-img" href="images/screenshots/acs_failure.png"><img src="images/faq/acs_failure.png" alt="acs display failure"></a> <p>When alternate character support (ACS) <a href="http://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing">is unavailable</a> borders become characters like the picture above. This is a terminal bug.</p> - <p>Unfortunately there doesn't seem to be a way for Nyx to automatically detect this. However, when it happens this <b>can</b> be easily corrected. Simply run <i>reset</i>. To tell Nyx not to use ACS borders simply add the following to your <a href="#configuration">nyxrc</a>...</p> + <p>Unfortunately there doesn't seem to be a way for Nyx to automatically detect this. However, when it happens this <b>can</b> be easily corrected. Simply run <i>reset</i>. To tell Nyx not to use ACS borders simply add the following to your <a href="#configuration">nyx configuration</a>...</p> <pre>acs_support false</pre> </div> </li> @@ -487,18 +487,18 @@ sudo python setup.py install</pre><br></li> <div class="section"></div> <a href="#configuration" class="section-title">Configuration</a> - <p>Like many terminal applications Nyx can be customized through a configuration file. By default <b>~/.nyx/nyxrc</b>, though you can specify one with <b>nyx --config /path/to/nyxrc</b>.</p> + <p>Like many terminal applications Nyx can be customized through a configuration file. By default <b>~/.nyx/configc</b>, though you can specify one with <b>nyx --config /path/to/nyx_config</b>.</p> <p>Configurations are a simple series of key/value pairs. <a href="https://stem.torproject.org/api/util/conf.html">See Stem</a> for details. For example...</p> - <pre id="nyxrc-example"> + <pre id="nyx-config-example"> acs_support false color_override blue # make our UI predominately blue logged_events BW, NOTICE, WARN, ERR </pre> - <h2 class="nyxrc-section">General Options</h2> + <h2 class="nyx-config-section">General Options</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -560,9 +560,9 @@ logged_events BW, NOTICE, WARN, ERR </tr> </table> - <h2 class="nyxrc-section">Update Rates</h2> + <h2 class="nyx-config-section">Update Rates</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -594,9 +594,9 @@ logged_events BW, NOTICE, WARN, ERR </tr> </table> - <h2 class="nyxrc-section">Logging</h2> + <h2 class="nyx-config-section">Logging</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -640,9 +640,9 @@ logged_events BW, NOTICE, WARN, ERR </tr> </table> - <h2 class="nyxrc-section">Graphing</h2> + <h2 class="nyx-config-section">Graphing</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -704,9 +704,9 @@ logged_events BW, NOTICE, WARN, ERR </td> </table> - <h2 class="nyxrc-section">Tor Configuration</h2> + <h2 class="nyx-config-section">Tor Configuration</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -744,9 +744,9 @@ logged_events BW, NOTICE, WARN, ERR </tr> </table> - <h2 class="nyxrc-section">Connections</h2> + <h2 class="nyx-config-section">Connections</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> @@ -782,9 +782,9 @@ logged_events BW, NOTICE, WARN, ERR </tr> </table> - <h2 class="nyxrc-section">Component Visibility</h2> + <h2 class="nyx-config-section">Component Visibility</h2> - <table class="nyxrc-options"> + <table class="nyx-config-options"> <tr> <td width="125"><b>Option</b></td> <td width="100"><b>Default</b></td> diff --git a/web/styles.css b/web/styles.css index e412f17..68c8c84 100644 --- a/web/styles.css +++ b/web/styles.css @@ -327,26 +327,26 @@ Download Page Configuration Page ============================================================*/ -#nyxrc-example { +#nyx-config-example { text-align: left; } -.nyxrc-section { +.nyx-config-section { margin-bottom: 10px; font-size: 23px; text-align: left; } -.nyxrc-options { +.nyx-config-options { text-align: left; border-collapse: collapse; } -.nyxrc-options table, th, td { +.nyx-config-options table, th, td { border: 1px solid #ccc; } -.nyxrc-options td { +.nyx-config-options td { padding: 5px; vertical-align: top; }

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 29 Oct '20

29 Oct '20

commit 55b73c809d69e3648e1a74ac642db5254f6a914f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 29 00:16:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he.po b/he.po index 51099fd598..6070d43ed2 100644 --- a/he.po +++ b/he.po @@ -10,7 +10,7 @@ # ION, 2017-2020 # Johnny Diralenzo, 2015 # Kunda, 2014 -# Omeritzics Games, 2020 +# Omer I.S., 2020 # Ruben <drarbib(a)gmail.com>, 2014 msgid "" msgstr ""

1 0

[stem/master] Permit float in label functions
by atagar＠torproject.org 28 Oct '20

28 Oct '20

commit 84602486f5a6eb2c4558656ca4f532e4bc81e92b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 28 16:40:36 2020 -0700 Permit float in label functions Oops. Actually, our last release allowed floats (and our 'decimal' argument doesn't make terribly much sense otherwise). We *did* have a bug in that remainder values that are less than 1 crashed us (corrected by commit c90e87c), but we shouldn't have addressed that by integer normalization. Regression caught thanks to Nyx's tests... ====================================================================== FAIL: test_draw_line (panel.connection.TestConnectionPanel) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/nyx/test/__init__.py", line 59, in wrapped return func(self, *args, **kwargs) File "/usr/lib/python3.8/unittest/mock.py", line 1325, in patched return func(*newargs, **newkeywargs) File "/home/atagar/Desktop/nyx/test/panel/connection.py", line 228, in test_draw_line self.assertEqual(expected, rendered.content) AssertionError: ' 75.119.206.243:22 (de) --> 82.121.9.9:3531 15.4s (INBOUND)' != ' 75.119.206.243:22 (de) --> 82.121.9.9:3531 14.9s (INBOUND)' - 75.119.206.243:22 (de) --> 82.121.9.9:3531 15.4s (INBOUND) ? ^ ^ + 75.119.206.243:22 (de) --> 82.121.9.9:3531 14.9s (INBOUND) ? ^ ^ --- docs/change_log.rst | 1 + stem/util/str_tools.py | 24 ++++++------------------ test/unit/util/str_tools.py | 1 + 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index cc830d6c..b3544569 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -65,6 +65,7 @@ The following are only available within Stem's `git repository * **Descriptors** + * Cached CollecTor files always reported a hash mismatch (:ticket:`76`) * *transport* lines within extrainfo descriptors failed to validate * **Utilities** diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index 9803d437..a9a34364 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -298,7 +298,7 @@ def crop(msg: str, size: int, min_word_length: int = 4, min_crop: int = 0, endin return (return_msg, remainder) if get_remainder else return_msg -def size_label(byte_count: int, decimal: int = 0, is_long: bool = False, is_bytes: bool = True, round: bool = False) -> str: +def size_label(byte_count: Union[int, float], decimal: int = 0, is_long: bool = False, is_bytes: bool = True, round: bool = False) -> str: """ Converts a number of bytes into a human readable label in its most significant units. For instance, 7500 bytes would return "7 KB". If the @@ -329,16 +329,13 @@ def size_label(byte_count: int, decimal: int = 0, is_long: bool = False, is_byte :returns: **str** with human readable representation of the size """ - if isinstance(byte_count, float): - byte_count = int(byte_count) - if is_bytes: return _get_label(SIZE_UNITS_BYTES, byte_count, decimal, is_long, round) else: return _get_label(SIZE_UNITS_BITS, byte_count, decimal, is_long, round) -def time_label(seconds: int, decimal: int = 0, is_long: bool = False) -> str: +def time_label(seconds: Union[int, float], decimal: int = 0, is_long: bool = False) -> str: """ Converts seconds into a time label truncated to its most significant units. For instance, 7500 seconds would return "2h". Units go up through days. @@ -366,13 +363,10 @@ def time_label(seconds: int, decimal: int = 0, is_long: bool = False) -> str: :returns: **str** with human readable representation of the time """ - if isinstance(seconds, float): - seconds = int(seconds) - return _get_label(TIME_UNITS, seconds, decimal, is_long) -def time_labels(seconds: int, is_long: bool = False) -> Sequence[str]: +def time_labels(seconds: Union[int, float], is_long: bool = False) -> Sequence[str]: """ Provides a list of label conversions for each time unit, starting with its most significant units on down. Any counts that evaluate to zero are omitted. @@ -392,9 +386,6 @@ def time_labels(seconds: int, is_long: bool = False) -> Sequence[str]: :returns: **list** of strings with human readable representations of the time """ - if isinstance(seconds, float): - seconds = int(seconds) - time_labels = [] for count_per_unit, _, _ in TIME_UNITS: @@ -405,7 +396,7 @@ def time_labels(seconds: int, is_long: bool = False) -> Sequence[str]: return time_labels -def short_time_label(seconds: int) -> str: +def short_time_label(seconds: Union[int, float]) -> str: """ Provides a time in the following format: [[dd-]hh:]mm:ss @@ -425,9 +416,6 @@ def short_time_label(seconds: int) -> str: :raises: **ValueError** if the input is negative """ - if isinstance(seconds, float): - seconds = int(seconds) - if seconds < 0: raise ValueError("Input needs to be a non-negative integer, got '%i'" % seconds) @@ -557,7 +545,7 @@ def _parse_iso_timestamp(entry: str) -> 'datetime.datetime': return timestamp + datetime.timedelta(microseconds = int(microseconds)) -def _get_label(units: Sequence[Tuple[float, str, str]], count: int, decimal: int, is_long: bool, round: bool = False) -> str: +def _get_label(units: Sequence[Tuple[float, str, str]], count: Union[int, float], decimal: int, is_long: bool, round: bool = False) -> str: """ Provides label corresponding to units of the highest significance in the provided set. This rounds down (ie, integer truncation after visible units). @@ -582,7 +570,7 @@ def _get_label(units: Sequence[Tuple[float, str, str]], count: int, decimal: int return '%s%s' % (label_format % count, units_label) for count_per_unit, short_label, long_label in units: - if remainder >= count_per_unit: + if remainder >= count_per_unit or count_per_unit == 1: if not round: # Rounding down with a '%f' is a little clunky. Reducing the remainder # so it'll divide evenly as the rounded down value. diff --git a/test/unit/util/str_tools.py b/test/unit/util/str_tools.py index 8b0365f7..73c7b4d9 100644 --- a/test/unit/util/str_tools.py +++ b/test/unit/util/str_tools.py @@ -99,6 +99,7 @@ class TestStrTools(unittest.TestCase): self.assertEqual('0s', str_tools.time_label(0.1)) self.assertEqual('0 seconds', str_tools.time_label(0, is_long = True)) self.assertEqual('0.00s', str_tools.time_label(0, 2)) + self.assertEqual('0.10s', str_tools.time_label(0.1, 2)) self.assertEqual('-10s', str_tools.time_label(-10)) self.assertRaises(TypeError, str_tools.time_label, None)

1 0

[nyx/master] Fix unit tests
by atagar＠torproject.org 28 Oct '20

28 Oct '20

commit 3ea784a3af26e6772e8ab3531e7185895567a6c7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 28 15:02:01 2020 -0700 Fix unit tests I don't run Nyx's unit tests very often so a few regressions slipped in. Some due to Nyx adjustments, some from Stem. Stem renamed its is_pep8_available() function to is_pycodestyle_available() because the upstream project renamed itself... Traceback (most recent call last): File "./run_tests.py", line 80, in <module> main() File "/home/atagar/Desktop/nyx/stem/util/conf.py", line 289, in wrapped return func(*args, **kwargs) File "./run_tests.py", line 46, in main if stem.util.test_tools.is_pep8_available(): AttributeError: module 'stem.util.test_tools' has no attribute 'is_pep8_available' --- nyx/__init__.py | 1 + nyx/curses.py | 2 +- nyx/panel/log.py | 2 +- run_tests.py | 2 +- setup.py | 2 +- test/panel/config.py | 2 +- test/panel/connection.py | 12 ++++++++---- test/panel/header.py | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 67053aa..9fbf2c0 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -138,6 +138,7 @@ def conf_handler(key, value): if key == 'redraw_rate': return max(1, value) + CONFIG = stem.util.conf.config_dict('nyx', { 'confirm_quit': True, 'redraw_rate': 5, diff --git a/nyx/curses.py b/nyx/curses.py index 3c3fa69..5ff5cfb 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -115,7 +115,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') +ANSI_RE = re.compile('\x1B\\[([0-9;]+)m') CURSES_COLORS = { Color.RED: curses.COLOR_RED, diff --git a/nyx/panel/log.py b/nyx/panel/log.py index bbb1961..c6587a1 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -196,7 +196,7 @@ class LogPanel(nyx.panel.DaemonPanel): try: if not os.path.exists(base_dir): os.makedirs(base_dir) - except OSError as exc: + except OSError: raise IOError("unable to make directory '%s'" % base_dir) event_log = list(self._event_log) diff --git a/run_tests.py b/run_tests.py index 4c7f73d..3cab8a6 100755 --- a/run_tests.py +++ b/run_tests.py @@ -43,7 +43,7 @@ def main(): if stem.util.test_tools.is_pyflakes_available(): pyflakes_task = stem.util.system.DaemonTask(stem.util.test_tools.pyflakes_issues, (SRC_PATHS,), start = True) - if stem.util.test_tools.is_pep8_available(): + if stem.util.test_tools.is_pycodestyle_available(): pycodestyle_task = stem.util.system.DaemonTask(stem.util.test_tools.stylistic_issues, (SRC_PATHS,), start = True) tests = unittest.defaultTestLoader.discover('test', pattern = '*.py') diff --git a/setup.py b/setup.py index 7e9b996..a4cd132 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ global-exclude *~ # installation. As such, just reading our file for the parameters we need. ATTR = {} -ATTR_LINE = re.compile("^__(\S+)__ = '(.+)'") +ATTR_LINE = re.compile("^__(\\S+)__ = '(.+)'") with open('nyx/__init__.py') as init_file: for line in init_file: diff --git a/test/panel/config.py b/test/panel/config.py index 0bf51ab..7b138d0 100644 --- a/test/panel/config.py +++ b/test/panel/config.py @@ -20,7 +20,7 @@ EXPECTED_LINE = 'ControlPort 9051 Port providing access to t EXPECTED_DETAIL_DIALOG = """ +------------------------------------------------------------------------------+ | ControlPort (General Option) | -| Value: 9051 (custom, LineList, usage: PORT|unix:path|auto [flags]) | +| Value: 9051 (custom, LineList, usage: [address:]port|unix:path|auto [flags]) | | Description: If set, Tor will accept connections on this port and allow those| | connections to control the Tor process using the Tor Control Protocol (des-| | cribed in control-spec.txt in torspec). Note: unless you also specify one | diff --git a/test/panel/connection.py b/test/panel/connection.py index b432df5..56a7a66 100644 --- a/test/panel/connection.py +++ b/test/panel/connection.py @@ -201,8 +201,10 @@ class TestConnectionPanel(unittest.TestCase): @require_curses @patch('nyx.panel.connection.tor_controller') def test_draw_line(self, tor_controller_mock): - tor_controller_mock().is_geoip_unavailable.return_value = False - tor_controller_mock().get_info.return_value = '82.121.9.9' + tor_controller_mock().get_info.side_effect = lambda param, default = None: { + 'ip-to-country/ipv4-available': '1', + 'address': '82.121.9.9', + }[param] test_data = (( line(), @@ -228,8 +230,10 @@ class TestConnectionPanel(unittest.TestCase): @require_curses @patch('nyx.panel.connection.tor_controller') def test_draw_address_column(self, tor_controller_mock): - tor_controller_mock().is_geoip_unavailable.return_value = False - tor_controller_mock().get_info.return_value = '82.121.9.9' + tor_controller_mock().get_info.side_effect = lambda param, default = None: { + 'ip-to-country/ipv4-available': '1', + 'address': '82.121.9.9', + }[param] test_data = (( line(), diff --git a/test/panel/header.py b/test/panel/header.py index 12db48f..fade2be 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -92,7 +92,6 @@ class TestHeaderPanel(unittest.TestCase): @patch('time.time', Mock(return_value = 1234.5)) @patch('os.times', Mock(return_value = (0.08, 0.03, 0.0, 0.0, 18759021.31))) @patch('os.uname', Mock(return_value = ('Linux', 'odin', '3.5.0-54-generic', '#81~precise1-Ubuntu SMP Tue Jul 15 04:05:58 UTC 2014', 'i686'))) - @patch('stem.util.system.start_time', Mock(return_value = 5678)) @patch('stem.util.proc.file_descriptors_used', Mock(return_value = 89)) def test_sample(self, consensus_tracker_mock, resource_tracker_mock, tor_controller_mock): tor_controller_mock().is_alive.return_value = True @@ -100,6 +99,7 @@ class TestHeaderPanel(unittest.TestCase): tor_controller_mock().get_latest_heartbeat.return_value = 89.0 tor_controller_mock().get_newnym_wait.return_value = 0 tor_controller_mock().get_exit_policy.return_value = stem.exit_policy.ExitPolicy('reject *:*') + tor_controller_mock().get_start_time.return_value = 5678 tor_controller_mock().get_version.return_value = stem.version.Version('0.1.2.3-tag') tor_controller_mock().get_pid.return_value = '123'

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 28 Oct '20

28 Oct '20

commit 98d38fb97e4d204a6e772864f8ef4d3ba21bee92 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 22:45:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+it.po | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/contents+it.po b/contents+it.po index 88ea002473..f23c29b9da 100644 --- a/contents+it.po +++ b/contents+it.po @@ -2401,62 +2401,63 @@ msgstr "" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "## During the Training" -msgstr "## Durante la formazione" +msgstr "## Durante la Formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "Before starting the training, make sure you:" -msgstr "Prima di iniziare la formazione, assicurati di:" +msgstr "Prima di iniziare la formazione:" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Make an agreement about taking or not taking photos" msgstr "" +"[ ] Prendi un accordo sulla possibilità o meno di scattare fotografie" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Present the agenda" -msgstr "" +msgstr "[ ] Aver presentato l'agenda" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Introduce yourself and ask people to introduce themselves" -msgstr "" +msgstr " [ ] Presentati e chiedi alle persone di presentarsi" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] \"All questions are welcome\"" -msgstr "" +msgstr "[ ] \"Tutte le domande sono benvenute\"" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "## After the Training" -msgstr "" +msgstr "## Dopo la Formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Collect participants feedback" -msgstr "" +msgstr "[ ] Raccogli il feedback dei partecipanti" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Leave an e-mail for further contact and support" -msgstr "" +msgstr "[ ] Lascia una e-mail per ulteriore contatto e supporto" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Make an evaluation about the training" -msgstr "" +msgstr "[ ] Fai una valutazione sulla formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] Report privately to Community Team" -msgstr "" +msgstr "[ ] Riferisci privatamente al Community Team" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.title) msgid "Training Best Practices" -msgstr "" +msgstr "Best Practices per la Formazione" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.subtitle) @@ -2465,11 +2466,14 @@ msgid "" "Good preparation is essential to an effective and safe training, so we've " "curated some resources to help you make the most of your training event." msgstr "" +"Una buona preparazione è essenziale per una formazione efficace e sicura, " +"quindi abbiamo curato alcune risorse per aiutarti a ottenere il massimo dal " +"tuo evento di formazione." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.cta) msgid "Best Practices for Trainers" -msgstr "" +msgstr "Best Practices per i Formatori" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) @@ -2477,16 +2481,19 @@ msgid "" "Running security training is a fun and rewarding way to help your community " "conduct human rights work safely." msgstr "" +"Organizzare corsi di formazione sulla sicurezza è un modo divertente e " +"gratificante per aiutare la tua comunità a condurre il lavoro sui diritti " +"umani in sicurezza." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "## Before the training" -msgstr "" +msgstr "## Dopo la formazione" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) msgid "_Am I the right person to give this training?_" -msgstr "" +msgstr "_Sono la persona giusta per dare questa formazione?_" #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) @@ -2495,6 +2502,9 @@ msgid "" "but there are additional considerations to be made before training some at-" "risk groups." msgstr "" +"I corsi di formazione sulla sicurezza possono aiutare le persone a " +"comunicare e utilizzare Internet in modo sicuro, ma ci sono ulteriori " +"considerazioni da fare prima di formare alcuni gruppi a rischio." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) @@ -2503,6 +2513,9 @@ msgid "" "Companion, [\"Am I the right person to give this " "training?\"](https://sec.eff.org/articles/right-person-to-train)." msgstr "" +"Ecco perché consigliamo questa risorsa dell'EFF Security Education " +"Companion, [\"Am I the right person to give this " +"training?\"](https://sec.eff.org/articles/right-person-to-train)." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 28 Oct '20

28 Oct '20

commit 59c64325c7e13d1d41aac13d5827099b46b2c862 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 22:15:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+it.po | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/contents+it.po b/contents+it.po index c03dfdd5ad..88ea002473 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1810,7 +1810,7 @@ msgstr "" #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) msgid "" "Sometimes it is not clear which AS you are buying from in case of resellers." -msgstr "" +msgstr "A volte non è chiaro quale AS si acquista in caso di rivenditori." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -1922,6 +1922,9 @@ msgid "" "points are crucial for a Tor relay, so we want to mention them here " "nonetheless." msgstr "" +"La configurazione del sistema operativo non rientra nello scopo di questa " +"guida, ma i seguenti punti sono fondamentali per un relay Tor, quindi " +"vogliamo citarli qui." #: https//community.torproject.org/relay/technical-considerations/ #: (content/relay-operations/technical-considerations/contents+en.lrpage.body) @@ -2327,7 +2330,7 @@ msgstr "[ ] Ho un'agenda per la formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] I reviewed the training slides" -msgstr "" +msgstr "[ ] Ho rivisto le diapositive dell'addestramento" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) @@ -2340,6 +2343,8 @@ msgid "" "[ ] I already contacted my organization and told them that I'm organizing " "this training" msgstr "" +"[ ] Ho già contattato la mia organizzazione e ho detto loro che sto " +"organizzando questo corso di formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) @@ -2347,41 +2352,46 @@ msgid "" "[ ] I shared a contact to whom my organization should call if something " "happens" msgstr "" +"[ ] Ho condiviso un contatto con il quale la mia organizzazione dovrebbe " +"chiamare se succede qualcosa" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "## About the Venue" -msgstr "" +msgstr "## Informazioni sull'evento" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] The venue has enough tables and chairs to everyone" -msgstr "" +msgstr "[ ] Il luogo ha abbastanza tavoli e sedie per tutti" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] The venue has internet connection and I know the wifi password" msgstr "" +"[ ] Il luogo ha una connessione Internet e conosco la password del wifi" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] It has a projector available and works on my computer" -msgstr "" +msgstr "[ ] È disponibile un proiettore e funziona sul computer" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "## Audience & Communication" -msgstr "" +msgstr "## Pubblico e comunicazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] I sent an e-mail with the address and time to all participants" msgstr "" +"[ ] Ho inviato una e-mail con l'indirizzo e l'ora a tutti i partecipanti" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "[ ] I asked them to bring the necessary equipment to the training" msgstr "" +"[ ] Ho chiesto loro di portare le attrezzature necessarie alla formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) @@ -2391,12 +2401,12 @@ msgstr "" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "## During the Training" -msgstr "" +msgstr "## Durante la formazione" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body) msgid "Before starting the training, make sure you:" -msgstr "" +msgstr "Prima di iniziare la formazione, assicurati di:" #: https//community.torproject.org/training/checklist/ #: (content/training/checklist/contents+en.lrpage.body)

1 0

[tor-browser-build/master] Bug 40139: Pick up rbm commit for bug 40008
by sysrqb＠torproject.org 28 Oct '20

28 Oct '20

commit 20d0226341581f8dbc61ffbb12cae102ad7470bd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 28 22:08:13 2020 +0000 Bug 40139: Pick up rbm commit for bug 40008 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a32239d..15c8476 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 +Subproject commit 15c84760ebe3f2677d1212aa00ef6f7485446a69

1 0

[rbm/master] Bug 40008: Fix caching of the exec template function
by sysrqb＠torproject.org 28 Oct '20

28 Oct '20

commit 15c84760ebe3f2677d1212aa00ef6f7485446a69 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 28 22:21:16 2020 +0100 Bug 40008: Fix caching of the exec template function In ce6b9136fc9e006536b we added caching of the exec template function, however we didn't take the project into account. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 825502a..074e385 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -483,7 +483,7 @@ sub execute { if (project_config($project, 'git_url', $options)) { my $git_hash = project_config($project, 'git_hash', $options) || exit_error "No git_hash specified for project $project"; - $res_name = "git-$git_hash-$cmd"; + $res_name = "git-$project-/-$git_hash-/-$cmd"; return $cache{$res_name} if exists $cache{$res_name}; git_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) @@ -500,7 +500,7 @@ sub execute { } elsif (project_config($project, 'hg_url', $options)) { my $hg_hash = project_config($project, 'hg_hash', $options) || exit_error "No hg_hash specified for project $project"; - $res_name = "hg-$hg_hash-$cmd"; + $res_name = "hg-$project-/-$hg_hash-/-$cmd"; return $cache{$res_name} if exists $cache{$res_name}; hg_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code)

1 0

[tor/master] Fix duplicate typedef in metrics_store_entry.h
by nickm＠torproject.org 28 Oct '20

28 Oct '20

commit df1637600469390cbc9bb3889a7130bfe5e0159e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 16:36:14 2020 -0400 Fix duplicate typedef in metrics_store_entry.h Fixes #40171. Bug not in any released Tor. --- src/lib/metrics/metrics_store_entry.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/metrics/metrics_store_entry.h b/src/lib/metrics/metrics_store_entry.h index 6fff9d10eb..8e8a8f3917 100644 --- a/src/lib/metrics/metrics_store_entry.h +++ b/src/lib/metrics/metrics_store_entry.h @@ -17,7 +17,7 @@ /** Metrics store entry. They reside in a metrics_store_t object and are * opaque to the outside world. */ -typedef struct metrics_store_entry_t { +struct metrics_store_entry_t { /** Type of entry. */ metrics_type_t type; @@ -38,7 +38,7 @@ typedef struct metrics_store_entry_t { metrics_counter_t counter; metrics_gauge_t gauge; } u; -} metrics_store_entry_t; +}; #endif /* METRICS_STORE_ENTRY_PRIVATE */

1 0

[donate-static/master] Update cryptocurrencies wallet addresses by Sue and Isa request.
by gus＠torproject.org 28 Oct '20

28 Oct '20

commit 54162367035c610c51246d33789342a860f89fa3 Author: gus <gus(a)torproject.org> Date: Tue Oct 27 12:43:33 2020 -0400 Update cryptocurrencies wallet addresses by Sue and Isa request. --- templates/cryptocurrency.html | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html index e81202f6..1244f79d 100644 --- a/templates/cryptocurrency.html +++ b/templates/cryptocurrency.html @@ -70,34 +70,29 @@ name: 'CryptocurrencyForm', props: { 'wallets': [ - { - 'symbol': 'REP', - 'id': '0x19DdD94B94D3c68385c897846AB44Ac99DBFAe0f', - 'name': 'Augur' - }, { 'symbol': 'XBT', - 'id': '1JADsmDFX9d2TXis63S9F9L8eDAXwJmnWE', + 'id': 'bc1qtt04zfgjxg7lpqhk9vk8hnmnwf88ucwww5arsd', 'name': 'Bitcoin', }, { 'symbol': 'BCH', - 'id': '1BK6d6vfLPDqZaBeKRd15oK5yxuLymi1Ry', + 'id': 'qrtyy8w9yv6ffqtny9gp56m8kztl3nwwzcqyzsv32k', 'name': 'Bitcoin Cash', }, { 'symbol': 'DASH', - 'id': 'Xkknor7eBf6vADMtP8VuNTPKsTsatCp8Xe', + 'id': 'XvF8mUwzKummA72GnkFojyeBuGByaG26mB', 'name': 'Dash', }, { 'symbol': 'ETH', - 'id': '0x19DdD94B94D3c68385c897846AB44Ac99DBFAe0f', + 'id': '0x532Fb5D00f40ced99B16d1E295C77Cda2Eb1BB4F', 'name': 'Ether', }, { 'symbol': 'LTC', - 'id': 'LNAifc8nfjtDJ8azRPiancbZSBftPzhfzb', + 'id': 'MTQBNhAP58vpWKsns4ZFUDoh5NK7XECVrs', 'name': 'Litecoin', }, { @@ -112,15 +107,10 @@ }, { 'symbol': 'ZEC', - 'id': 'zs1kpat3qseujnnukms9yjkx7w3kgzev7jxhauc6cy2s3mupmvsvkvw04u3s35sffmv57leznctn5h', + 'id': 't1NnsSG46uPPPMr3D3MdBCKrMpr9XXis8sz', 'name': 'Zcash' - }, - { - 'symbol': 'XDG', - 'id': 'DGvn1HLeMaCZEZZYUeBWBhUCJiS2hjzbGd', - 'name': 'Dogecoin', } - ], + ], 'donateProccessorBaseUrl': `{{ bag('donate', envvars('ENV'), 'donateProccessorBaseUrl') }}`, } };

1 0