From 04ded0c6f502abca0a5d4a69a44bbe82cffadbcd Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Tue, 26 Jan 2021 15:39:28 +0100
Subject: [PATCH] Plugin tor_: fix autoconf issues

Closes: #1166
---
 plugins/tor/tor_ | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/plugins/tor/tor_ b/plugins/tor/tor_
index c5a0d6ad..fab0e5a8 100755
--- a/plugins/tor/tor_
+++ b/plugins/tor/tor_
@@ -158,29 +158,24 @@ class TorPlugin(object):
                 print('{}.{} {}'.format(label, key, val))
 
     @staticmethod
-    def autoconf():
+    def get_autoconf_status():
         try:
             import stem
-
         except ImportError as e:
-            print('no (failed to import the required python module "stem": {})'.format(e))
-
+            return 'no (failed to import the required python module "stem": {})'.format(e)
         try:
             import GeoIP  # noqa: F401
-
         except ImportError as e:
-            print('no (failed to import the required python module "GeoIP": {})'.format(e))
-
+            return 'no (failed to import the required python module "GeoIP": {})'.format(e)
         try:
             with gen_controller() as controller:
                 try:
                     authenticate(controller)
-                    print('yes')
+                    return 'yes'
                 except stem.connection.AuthenticationFailure as e:
-                    print('no (Authentication failed: {})'.format(e))
-
-        except stem.connection:
-            print('no (Connection failed)')
+                    return 'no (Authentication failed: {})'.format(e)
+        except stem.SocketError:
+            return 'no (Connection failed)'
 
     @staticmethod
     def suggest():
@@ -516,7 +511,7 @@ def main():
         param = 'fetch'
 
     if param == 'autoconf':
-        TorPlugin.autoconf()
+        print(TorPlugin.get_autoconf_status())
         sys.exit()
     elif param == 'suggest':
         TorPlugin.suggest()