From be499558843450a23649a49a9508bbea0ee6fe4e Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 4 Nov 2015 20:07:49 -0800 Subject: [PATCH] metasync: More precise exception catching (#1700) --- beetsplug/metasync/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/beetsplug/metasync/__init__.py b/beetsplug/metasync/__init__.py index 380c72707..fd40590bb 100644 --- a/beetsplug/metasync/__init__.py +++ b/beetsplug/metasync/__init__.py @@ -111,11 +111,13 @@ class MetaSyncPlugin(BeetsPlugin): # Instantiate the meta sources for player in sources: try: - meta_source_instances[player] = \ - META_SOURCES[player](self.config, self._log) + cls = META_SOURCES[player] except KeyError: self._log.error(u'Unknown metadata source \'{0}\''.format( player)) + + try: + meta_source_instances[player] = cls(self.config, self._log) except (ImportError, ConfigValueError) as e: self._log.error(u'Failed to instantiate metadata source ' u'\'{0}\': {1}'.format(player, e))