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

[sbws/master] Replace log message by checking bootstrap
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 36b0cd82619adaa382ef8d2a68029064244e5137 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:13:05 2018 +0000 Replace log message by checking bootstrap --- sbws/util/stem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 8d4989e..c4497b1 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -80,7 +80,7 @@ def is_bootstrapped(c): try: line = c.get_info('status/bootstrap-phase') except Exception as e: - log.exception("Exception bootstrapping %s", e) + log.exception("Error trying to check bootstrap phase %s", e) return False state, _, progress, *_ = line.split() progress = int(progress.split('=')[1])

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit e7c51a10daf6ab718e25075814b68bee975e2704 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:15:58 2018 +0000 Replace Exception by the possible exceptions --- sbws/util/stem.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index c4497b1..0c36d61 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -1,6 +1,7 @@ from stem.control import (Controller, Listener) from stem import (SocketError, InvalidRequest, UnsatisfiableRequest, - OperationFailed) + OperationFailed, ControllerError, InvalidArguments, + ProtocolError) from stem.connection import IncorrectSocketType import stem.process from configparser import ConfigParser @@ -79,7 +80,7 @@ def init_controller(port=None, path=None, set_custom_stream_settings=True): def is_bootstrapped(c): try: line = c.get_info('status/bootstrap-phase') - except Exception as e: + except (ControllerError, InvalidArguments, ProtocolError) as e: log.exception("Error trying to check bootstrap phase %s", e) return False state, _, progress, *_ = line.split()

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 218da1c5243c4c9d95eb91f44be15a155b56e848 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:26:14 2018 +0000 Replace Exception by the possible exceptions --- sbws/util/stem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index b4190ef..e09f23c 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -195,7 +195,7 @@ def launch_tor(conf): try: cont.set_conf('__DisablePredictedCircuits', '1') cont.set_conf('__LeaveStreamsUnattached', '1') - except Exception as e: + except (ControllerError, InvalidArguments, InvalidRequest) as e: log.exception("Error trying to launch tor: %s. " "Maybe the tor directory is being used by other " "sbws instance?", e)

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 3036638b9ebe69bd36ab312b9eb5b275a39d89a8 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:32:05 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/circuitbuilder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index f143b6a..faa73cf 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -1,5 +1,5 @@ from stem import CircuitExtensionFailed, InvalidRequest, ProtocolError, Timeout -from stem import InvalidArguments +from stem import InvalidArguments, ControllerError import random from .relaylist import Relay import logging @@ -64,7 +64,7 @@ class CircuitBuilder: except InvalidArguments: pass self.built_circuits.discard(circ_id) - except Exception as e: + except (ControllerError, ValueError) as e: log.exception("Error trying to get circuit to close it: %s.", e) def _build_circuit_impl(self, path):

1 0

[sbws/master] Remove not needed exception
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 6064cbae49f7995971a176ad01be75a819973781 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:48:26 2018 +0000 Remove not needed exception --- sbws/lib/circuitbuilder.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index caca3eb..c2c9b97 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -82,9 +82,6 @@ class CircuitBuilder: ProtocolError, Timeout) as e: log.warning(e) continue - except Exception as e: - log.exception("Exception trying to build circuit: %s.", e) - continue else: return circ_id return None

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 4776f2e3c1d2929ce61110c6a6d10d73c827c6fa Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:42:22 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/circuitbuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index faa73cf..caca3eb 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -61,7 +61,7 @@ class CircuitBuilder: c.get_circuit(circ_id, default=None) try: c.close_circuit(circ_id) - except InvalidArguments: + except (InvalidArguments, InvalidRequest): pass self.built_circuits.discard(circ_id) except (ControllerError, ValueError) as e:

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit af869ad0701064600c9f1d161c8cb6300bb023f3 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:50:29 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/circuitbuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index c2c9b97..8791656 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -97,7 +97,7 @@ class CircuitBuilder: c.close_circuit(circ_id) except InvalidArguments: pass - except Exception as e: + except (ControllerError, InvalidArguments) as e: log.exception("Exception trying to get circuit to delete: %s", e) self.built_circuits.clear()

1 0

[sbws/master] Catch other possible exception
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 58934941b20cdcc583e17bdafd10265d7c2a6927 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:51:34 2018 +0000 Catch other possible exception --- sbws/lib/circuitbuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index 8791656..e3b3950 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -95,7 +95,7 @@ class CircuitBuilder: c.get_circuit(circ_id, default=None) try: c.close_circuit(circ_id) - except InvalidArguments: + except (InvalidArguments, InvalidRequest): pass except (ControllerError, InvalidArguments) as e: log.exception("Exception trying to get circuit to delete: %s",

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit c20f90acd6c7a10888b3dc4d48045d436ad957d8 Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:52:55 2018 +0000 Replace Exception by the possible exceptions --- sbws/lib/relaylist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index f674b62..f177a96 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -198,7 +198,7 @@ class RelayList: try: relays = [Relay(ns.fingerprint, c, ns=ns) for ns in c.get_network_statuses()] - except Exception as e: + except ControllerError as e: log.exception("Exception trying to init relays %s", e) return [] return relays

1 0

[sbws/master] Include target to build diagrams
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit c3264df50c685da7dd0160a51efced5b8e2b5690 Author: juga0 <juga(a)riseup.net> Date: Thu Jul 5 20:23:55 2018 +0000 Include target to build diagrams --- docs/Makefile | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index 66feed2..eee14f8 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,6 +7,12 @@ SPHINXBUILD = sphinx-build SPHINXPROJ = simple-bw-scanner SOURCEDIR = source BUILDDIR = build +# generate SVG +IMAGEDIRS = $(SOURCEDIR)/images +BUILDDIRIMAGES = $(BUILDDIR)/html/_images +PYREVERSE = pyreverse +PYREVERSE_FLAGS = -o svg -p sbws ../sbws +UMLSVG := $(PYREVERSE) $(PYREVERSE_FLAGS);mv *.svg $(IMAGEDIRS);mkdir -p $(BUILDDIRIMAGES);cp $(IMAGEDIRS)/*.svg $(BUILDDIRIMAGES) # Put it first so that "make" without argument is like "make help". help: @@ -14,7 +20,14 @@ help: .PHONY: help Makefile +umlsvg: + @echo "Generating UML SVG" + $(UMLSVG) + # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile + # commented because if system packages invoke make html, it'll automatically + # recreate the svg on every build, and it's not deterministic. + #$(UMLSVG) @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/setup.py b/setup.py index b7be0f7..738be70 100755 --- a/setup.py +++ b/setup.py @@ -82,6 +82,6 @@ setup( 'dev': ['flake8'], 'test': ['tox', 'pytest', 'coverage'], # recommonmark: to make sphinx render markdown - 'doc': ['sphinx', 'recommonmark'], + 'doc': ['sphinx', 'recommonmark', 'pylint'], }, )

1 0