tor-commits May 2020

tor-commits@lists.torproject.org

18 participants
1587 discussions

[chutney/master] lint: Remove unused variables and modules
by nickm＠torproject.org 15 May '20

15 May '20

commit 9c325ceb15ac0f3d6181b2c393d743633b9b508e Author: c <c(a)chroniko.jp> Date: Thu May 14 21:34:04 2020 +0000 lint: Remove unused variables and modules --- lib/chutney/TorNet.py | 3 +-- lib/chutney/Traffic.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 41390e6..aceddb8 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -19,7 +19,6 @@ import os import platform import re import signal -import shutil import subprocess import sys import time @@ -389,7 +388,7 @@ def get_tor_modules(tor): ] try: mods = run_tor(cmdline) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: # Tor doesn't support --list-modules; act as if it said nothing. mods = "" diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index d8918ee..2fae512 100755 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -28,9 +28,7 @@ from __future__ import unicode_literals import sys import socket import struct -import errno import time -import os import asyncore import asynchat

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/71'
by nickm＠torproject.org 15 May '20

15 May '20

commit b3d68896858c3456bec1140afc8e078967c1713d Merge: 76ba7f8 9c325ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 20:00:59 2020 -0400 Merge remote-tracking branch 'tor-github/pr/71' lib/chutney/TorNet.py | 1 - lib/chutney/Traffic.py | 2 -- 2 files changed, 3 deletions(-)

1 0

[stem/master] Sphinx fixes
by atagar＠torproject.org 14 May '20

14 May '20

commit c84b5c8fc34ed107bc5b3ee1b8d8e1b8783243e5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 11 15:26:37 2020 -0700 Sphinx fixes Just correcting a few minor sphinx warnings... /home/atagar/Desktop/stem/docs/download.rst:165: WARNING: Inline interpreted text or phrase reference start-string without end-string. /home/atagar/Desktop/stem/docs/tutorials/east_of_the_sun.rst:65: WARNING: Literal block ends without a blank line; unexpected unindent. /home/atagar/Desktop/stem/docs/tutorials/mirror_mirror_on_the_wall.rst:2: WARNING: Duplicate explicit target name: "benchmark script". /home/atagar/Desktop/stem/docs/tutorials/mirror_mirror_on_the_wall.rst:2: WARNING: Duplicate explicit target name: "benchmark script". --- docs/download.rst | 2 +- docs/tutorials/east_of_the_sun.rst | 1 + docs/tutorials/mirror_mirror_on_the_wall.rst | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index dcf7c7ad..ae2f4fb3 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -162,7 +162,7 @@ Download - .. image:: /_static/label/archlinux.png :target: https://www.archlinux.org/packages/community/any/python-stem/ - Package by Sjon for `Arch Linux... + Package by Sjon for `Arch Linux <https://www.archlinux.org/>`_... :: diff --git a/docs/tutorials/east_of_the_sun.rst b/docs/tutorials/east_of_the_sun.rst index 4303170f..5b386e0e 100644 --- a/docs/tutorials/east_of_the_sun.rst +++ b/docs/tutorials/east_of_the_sun.rst @@ -62,6 +62,7 @@ that <../api/util/system.html#stem.util.system.DaemonTask>`_. % python fibonacci_multiprocessing.py took 6.2 seconds + .. _connection-resolution: Connection Resolution diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index 0d8b0b57..8d72760a 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -392,7 +392,7 @@ So what does code with each of these look like? Stem Example ------------ -* `Benchmark Script <../.../../_static/example/benchmark_stem.py>`_ +* `Stem Benchmark Script <../.../../_static/example/benchmark_stem.py>`_ .. literalinclude:: /_static/example/benchmark_server_descriptor_stem.py :language: python @@ -400,7 +400,7 @@ Stem Example Metrics-lib Example ------------------- -* `Benchmark Script <../.../../_static/example/benchmark_metrics_lib.java>`_ +* `Metrics-lib Benchmark Script <../.../../_static/example/benchmark_metrics_lib.java>`_ .. literalinclude:: /_static/example/benchmark_server_descriptor_metrics_lib.java :language: java @@ -408,7 +408,7 @@ Metrics-lib Example Zoossh Example -------------- -* `Benchmark Script <../.../../_static/example/benchmark_zoossh.go>`_ +* `Zoossh Benchmark Script <../.../../_static/example/benchmark_zoossh.go>`_ .. literalinclude:: /_static/example/benchmark_server_descriptor_zoossh.go :language: go

1 0

[stem/master] Fix favicon links
by atagar＠torproject.org 14 May '20

14 May '20

commit 63eb5136fa612b439aae15b881fe9fe602788347 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 16:16:44 2020 -0700 Fix favicon links The favicon on our website works, but the build warns... WARNING: logo file 'logo.png' does not exist WARNING: favicon file 'favicon.png' does not exist --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 5e20a71b..03268c57 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -127,13 +127,13 @@ html_short_title = 'Stem Docs' # The name of an image file (relative to this directory) to place at the top # of the sidebar. -html_logo = 'logo.png' +html_logo = '_static/logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -html_favicon = 'favicon.png' +html_favicon = '_static/favicon.png' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,

1 0

[stem/master] Fix autodoc configuration
by atagar＠torproject.org 14 May '20

14 May '20

commit c78e068cef2569804c7cc50d00f2b3bd4a0e7f54 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 11 16:25:49 2020 -0700 Fix autodoc configuration Autodoc deprecated its autodoc_default_flags configuration in version 1.8. As a result with new Sphinx versions our API documentation is empty. Moving to their new configuration mechanism... https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html#confval-… --- docs/conf.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 6535135b..247220f8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -28,8 +28,12 @@ needs_sphinx = '1.1' # required for the sphinx-apidoc command # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'roles'] -autodoc_member_order = 'bysource' -autodoc_default_flags = ['members', 'show-inheritance', 'undoc-members'] +autodoc_default_options = { + 'members': True, + 'member-order': 'bysource', + 'show-inheritance': True, + 'undoc-members': True, +} # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates']

1 0

[stem/master] Fix smartquotes configuration
by atagar＠torproject.org 14 May '20

14 May '20

commit 06aba288d13400cc491e5dfb51432f21c009a106 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 16:06:49 2020 -0700 Fix smartquotes configuration Sphinx deprecated the configuration option we used to disable smartquotes... RemovedInSphinx17Warning: html_use_smartypants option is deprecated. Smart quotes are on by default; if you want to disable or customize them, use the smart_quotes option in docutils.conf. Despite this warning the actual configuration name they went with doesn't have an underscore... https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-smart… --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 247220f8..5e20a71b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -146,7 +146,7 @@ html_static_path = ['_static'] # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. -html_use_smartypants = False +smartquotes = False # Custom sidebar templates, maps document names to template names. #html_sidebars = {}

1 0

[stem/master] Fix malformed class links
by atagar＠torproject.org 14 May '20

14 May '20

commit 3339630ee286f4f1059a5a17db6d17b0f10f2c40 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 16:52:28 2020 -0700 Fix malformed class links Sphinx class references are of the form... :class:`module.class_name` Our new collector module lacked a trailing backtick in a few spots. This caused the following build warnings... /home/atagar/Desktop/stem/stem/descriptor/collector.py:docstring of stem.descriptor.collector.File.read:4: WARNING: Inline interpreted text or phrase reference start-string without end-string. /home/atagar/Desktop/stem/stem/descriptor/collector.py:docstring of stem.descriptor.collector.CollecTor.get_microdescriptors:22: WARNING: Inline interpreted text or phrase reference start-string without end-string. /home/atagar/Desktop/stem/stem/descriptor/collector.py:docstring of stem.descriptor.collector.CollecTor.get_key_certificates:12: WARNING: Inline interpreted text or phrase reference start-string without end-string. /home/atagar/Desktop/stem/stem/descriptor/collector.py:docstring of stem.descriptor.collector.CollecTor.get_bandwidth_files:12: WARNING: Inline interpreted text or phrase reference start-string without end-string. /home/atagar/Desktop/stem/stem/descriptor/collector.py:docstring of stem.descriptor.collector.CollecTor.get_exit_lists:12: WARNING: Inline interpreted text or phrase reference start-string without end-string. --- stem/descriptor/collector.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/collector.py b/stem/descriptor/collector.py index 9749dadb..a978519d 100644 --- a/stem/descriptor/collector.py +++ b/stem/descriptor/collector.py @@ -212,7 +212,7 @@ class File(object): from disk as follows... * If this file has already been downloaded through - :func:`~stem.descriptor.collector.CollecTor.download' these descriptors + :func:`~stem.descriptor.collector.CollecTor.download` these descriptors are read from disk. * If a **directory** argument is provided and the file is already present @@ -485,7 +485,7 @@ class CollecTor(object): :param int retries: maximum attempts to impose on a per-archive basis :returns: **iterator** of - :class:`~stem.descriptor.microdescriptor.Microdescriptor + :class:`~stem.descriptor.microdescriptor.Microdescriptor` for the given time range :raises: :class:`~stem.DownloadFailed` if the download fails @@ -553,7 +553,7 @@ class CollecTor(object): :param int retries: maximum attempts to impose on a per-archive basis :returns: **iterator** of - :class:`~stem.descriptor.networkstatus.KeyCertificate + :class:`~stem.descriptor.networkstatus.KeyCertificate` for the given time range :raises: :class:`~stem.DownloadFailed` if the download fails @@ -577,7 +577,7 @@ class CollecTor(object): :param int retries: maximum attempts to impose on a per-archive basis :returns: **iterator** of - :class:`~stem.descriptor.bandwidth_file.BandwidthFile + :class:`~stem.descriptor.bandwidth_file.BandwidthFile` for the given time range :raises: :class:`~stem.DownloadFailed` if the download fails @@ -601,7 +601,7 @@ class CollecTor(object): :param int retries: maximum attempts to impose on a per-archive basis :returns: **iterator** of - :class:`~stem.descriptor.tordnsel.TorDNSEL + :class:`~stem.descriptor.tordnsel.TorDNSEL` for the given time range :raises: :class:`~stem.DownloadFailed` if the download fails

1 0

[stem/master] Fix broken parameter declarations
by atagar＠torproject.org 14 May '20

14 May '20

commit 08aeccdf890d8ba92794a734f34e2e93cd3e3219 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 12 17:02:06 2020 -0700 Fix broken parameter declarations Parameter declarations are of the form... :param type variable_name: description We wrap long lines, but it turns out that the ":param type variable_name:" portion must reside on a single line or Sphinx emits the following warnings... /home/atagar/Desktop/stem/stem/descriptor/hidden_service.py:docstring of stem.descriptor.hidden_service.HiddenServiceDescriptorV3.content:29: WARNING: Field list ends without a blank line; unexpected unindent. /home/atagar/Desktop/stem/stem/descriptor/hidden_service.py:docstring of stem.descriptor.hidden_service.HiddenServiceDescriptorV3.content:33: WARNING: Definition list ends without a blank line; unexpected unindent. --- stem/descriptor/hidden_service.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 2eb7d02f..84e8e9c0 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -964,10 +964,10 @@ class HiddenServiceDescriptorV3(HiddenServiceDescriptor): encrypted layer :param stem.descriptor.hidden_service.OuterLayer outer_layer: outer encrypted layer - :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey - identity_key: service identity key - :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey - signing_key: service signing key + :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey identity_key: + service identity key + :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey signing_key: + service signing key :param stem.descriptor.Ed25519CertificateV1 signing_cert: certificate signing this descriptor :param int revision_counter: descriptor revision number

1 0

[stem/master] Ignore __all__ attributes when bulding site
by atagar＠torproject.org 14 May '20

14 May '20

commit 0354799f583ecdda814349d2fc57a7fb9494a200 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 13 18:07:47 2020 -0700 Ignore __all__ attributes when bulding site Sphinx emits the following warnings... WARNING: missing attribute mentioned in :members: or __all__: module stem, attribute directory WARNING: missing attribute mentioned in :members: or __all__: module stem, attribute process WARNING: missing attribute mentioned in :members: or __all__: module stem.descriptor, attribute remote WARNING: missing attribute mentioned in :members: or __all__: module stem.response, attribute getinfo WARNING: missing attribute mentioned in :members: or __all__: module stem.response, attribute getconf WARNING: missing attribute mentioned in :members: or __all__: module stem.response, attribute authchallenge WARNING: missing attribute mentioned in :members: or __all__: module stem.util, attribute lru_cache WARNING: missing attribute mentioned in :members: or __all__: module stem.util, attribute ordereddict WARNING: missing attribute mentioned in :members: or __all__: module stem.util, attribute term WARNING: missing attribute mentioned in :members: or __all__: module stem.util, attribute test_tools These submodules all exist, but importlib.import_module() does not have attributes corresponding to them unless we've transitively imported its code prior to Sphinx's attempt to reference it. Honestly I don't fully grok the nuance behind how importlib works, but this configuration flag resolves these warnings so calling it good. --- docs/conf.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index 03268c57..aef0ff93 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -33,6 +33,30 @@ autodoc_default_options = { 'member-order': 'bysource', 'show-inheritance': True, 'undoc-members': True, + + # Without this Sphinx emits several warnings of the form... + # + # WARNING: missing attribute mentioned in :members: or __all__: module stem, attribute directory + # + # This is because Sphinx expects modules from importlib.import_module() to + # have attributes for its submodules. These attributes might or might not be + # present depending on what other modules have been imported. + # + # Said another way... + # + # % print(importlib.import_module('stem').__dict__.keys()) + # dict_keys(['__name__', '__doc__', '__package__', ...]) <= doesn't have submodules + # + # But if instead we call... + # + # % importlib.import_module('stem.connection') + # % print(importlib.import_module('stem').__dict__.keys()) + # dict_keys(['__name__', '__doc__', '__package__', ..., 'descriptor', 'control', 'connection']) <= includes submodules refernced by stem.connection + # + # By telling it to ignore our '__all__' attributes Sphinx will import in a + # fashon that doesn't emit these warnings. + + 'ignore-module-all': True, } # Add any paths that contain templates here, relative to this directory.

1 0

[stem/master] Sphinx 3.0.3 compatibility
by atagar＠torproject.org 14 May '20

14 May '20

commit 778c5a8c0b8b0cb90022c6d48f69c7c1c914b604 Merge: 99c3043f a22ebbda Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 14 16:24:45 2020 -0700 Sphinx 3.0.3 compatibility Upgrading Sphinx produced several warnings. Sphinx deprecated some configuration options, and apparently added some buggy features we need to work around. docs/api/descriptor/descriptor.rst | 2 +- docs/api/util/init.rst | 2 +- docs/conf.py | 65 +++++++++++++++++++++++++--- docs/download.rst | 2 +- docs/tutorials/east_of_the_sun.rst | 1 + docs/tutorials/mirror_mirror_on_the_wall.rst | 6 +-- stem/descriptor/collector.py | 10 ++--- stem/descriptor/hidden_service.py | 14 +++--- stem/descriptor/remote.py | 2 +- 9 files changed, 81 insertions(+), 23 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2020