Revert previous refactoring around Exceptions

[mpd-sima.git] / sima / utils / configtest.py

diff --git a/sima/utils/configtest.py b/sima/utils/configtest.py
index b777276afeae58ce3bf6d297273ce4681c3eb8d6..82b49c44f6b81f8aa56c3a2abdffab6ae6fa8bc4 100644 (file)
--- a/sima/utils/configtest.py
+++ b/sima/utils/configtest.py
@@ -5,7 +5,7 @@ import sys
 from logging import getLogger
 
 from ..mpdclient import MPD
-from ..mpdclient import MPDError, PlayerError
+from ..mpdclient import PlayerError
 
 from ..plugins.internal.tags import forge_filter, control_config
 
@@ -22,9 +22,9 @@ def tags_config_test(cli, config):
     try:
         # Use window to limit reponse size
         res = cli.find(filt, 'window', (0, 300))
-    except MPDError as err:
+    except PlayerError as err:
         cli.disconnect()
-        print('filter error: %s' % err, file=sys.stderr)
+        print(f'filter error: {err}', file=sys.stderr)
         sys.exit(1)
     artists = list({trk.albumartist for trk in res if trk.albumartist})
     if not artists:
@@ -44,7 +44,8 @@ def config_test(config):
     except PlayerError as err:
         print(err, file=sys.stderr)
         sys.exit(1)
-    tags_config_test(cli, config)
+    if 'Tags' in config.get('sima', 'internal'):
+        tags_config_test(cli, config)
 
 
 # VIM MODLINE