commit 68eb23a4006dadbd96c038c718e2714d91f424c1 Author: Matt Traudt sirmatt@ksu.edu Date: Tue Jun 12 20:32:09 2018 -0400

Fix .join needing only strs; first changelog entry --- CHANGELOG.md | 19 ++++++++++++++++++- sbws/lib/circuitbuilder.py | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index f8fba5c..648d149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,18 @@ -This file will be populated once we hit 1.0.0 +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Fixed + +- Exception that causes sbws to fall back to one measurement thread. We first + tried fixing something in this area with `88fae60bc` but neglected to +remember that `.join()` wants only string arguments and can't handle a `None`. +So fix that. + + +[Unreleased]: https://github.com/pastly/simple-bw-scanner/v0.4.0...master diff --git a/sbws/lib/circuitbuilder.py b/sbws/lib/circuitbuilder.py index 3c6c0fd..33df6ec 100644 --- a/sbws/lib/circuitbuilder.py +++ b/sbws/lib/circuitbuilder.py @@ -164,7 +164,7 @@ class GapsCircuitBuilder(CircuitBuilder): insert_relays = self._random_sample_relays( num_missing, [r for r in path if r is not None]) if insert_relays is None: - path = ','.join([r.nickname if r else None for r in path]) + path = ','.join([r.nickname if r else str(None) for r in path]) log.warning( 'Problem building a circuit to satisfy %s with available ' 'relays in the network', path)