[tor-commits] [sbws/master] Replace conf['tor']x by conf.getpath('tor', x)

[pastly at torproject.org]

commit 88ffb0eb431db7984f97c87901d16641fb91b5f4
Author: juga0 <juga at riseup.net>
Date:   Tue Jul 24 17:30:03 2018 +0000

    Replace conf['tor']x by conf.getpath('tor', x)
---
 sbws/core/scanner.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 64d6dba..3e24d22 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -316,7 +316,7 @@ def result_putter_error(target):
 
 def run_speedtest(args, conf):
     controller, _ = stem_utils.init_controller(
-        path=conf['tor']['control_socket'])
+        path=conf.getpath('tor', 'control_socket'))
     if not controller:
         controller = stem_utils.launch_tor(conf)
     else:
@@ -328,7 +328,8 @@ def run_speedtest(args, conf):
             'If you experience problems, you should try letting sbws launch '
             'Tor for itself. The ability to use an already running Tor only '
             'exists for sbws developers. It is expected to be broken and may '
-            'even lead to messed up results.', conf['tor']['control_socket'])
+            'even lead to messed up results.',
+            conf.getpath('tor', 'control_socket'))
         time.sleep(15)
     rl = RelayList(args, conf, controller)
     cb = CB(args, conf, controller, rl)