Cleanup Exceptions

diff --git a/sima/core.py b/sima/core.py
index 695a18ca3ca621293164cefef6c1fe088a5af7d7..7f3631cfb610c03346218c032da5d95e9ce143ad 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -26,7 +26,7 @@ from collections import deque
 from logging import getLogger
 
 from .mpdclient import MPD as PlayerClient
-from .mpdclient import PlayerError, MPDError
+from .mpdclient import PlayerError
 from .lib.simadb import SimaDB
 from .lib.daemon import Daemon
 from .utils.utils import SigHup
@@ -125,7 +125,7 @@ class Sima(Daemon):
             except PlayerError as err:
                 self.log.debug(err)
                 continue
-            except MPDError as err:
+            except PlayerError as err:
                 #TODO: unhandled Player exceptions
                 self.log.warning('Unhandled player exception: %s', err)
             self.log.info('Got reconnected')
@@ -160,13 +160,13 @@ class Sima(Daemon):
             self.log.info('Connecting MPD: %(host)s:%(port)s', self.config['MPD'])
             self.player.connect()
             self.foreach_plugin('start')
-        except (PlayerError, MPDError) as err:
+        except PlayerError as err:
             self.log.warning('Player: %s', err)
             self.reconnect_player()
         while 42:
             try:
                 self.loop()
-            except (PlayerError, MPDError) as err:
+            except PlayerError as err:
                 self.log.warning('Player error: %s', err)
                 self.reconnect_player()
                 del self.changed

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 45d3dcdf767ab4bbc21c77a2629d45a0b60a3bbc..4e6af68f37ec2614b71f3114da9746d56ae85af8 100644 (file)
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -22,7 +22,7 @@ from functools import wraps
 from logging import getLogger
 
 # external module
-from musicpd import MPDClient, MPDError
+from musicpd import MPDClient, MPDError as PlayerError
 
 
 # local import
@@ -32,10 +32,6 @@ from .lib.simastr import SimaStr
 from .utils.leven import levenshtein_ratio
 
 
-class PlayerError(MPDError):
-    """Fatal error in the player."""
-
-
 # Some decorators
 def bl_artist(func):
     def wrapper(*args, **kwargs):
@@ -139,20 +135,20 @@ class MPD(MPDClient):
         try:
             super().connect(host, port)
         # Catch socket errors
-        except IOError as err:
+        except OSError as err:
             raise PlayerError('Could not connect to "%s:%s": %s' %
                               (host, port, err.strerror))
         # Catch all other possible errors
         # ConnectionError and ProtocolError are always fatal.  Others may not
         # be, but we don't know how to handle them here, so treat them as if
         # they are instead of ignoring them.
-        except MPDError as err:
+        except PlayerError as err:
             raise PlayerError('Could not connect to "%s:%s": %s' %
                               (host, port, err))
         if password:
             try:
                 self.password(password)
-            except (MPDError, IOError) as err:
+            except (PlayerError, OSError) as err:
                 raise PlayerError("Could not connect to '%s': %s" % (host, err))
         # Controls we have sufficient rights
         available_cmd = self.commands()
@@ -232,7 +228,7 @@ class MPD(MPDClient):
         curr = self.current
         try:
             ret = self.idle('database', 'playlist', 'player', 'options')
-        except (MPDError, IOError) as err:
+        except (PlayerError, OSError) as err:
             raise PlayerError("Couldn't init idle: %s" % err)
         if self._skipped_track(curr):
             ret.append('skipped')

diff --git a/sima/utils/blcli.py b/sima/utils/blcli.py
index 63d3bf41113dd150158c1727971c32b826c13f04..56f36ca6b846a82627ec8b92a4c56f9f2bed8328 100644 (file)
--- a/sima/utils/blcli.py
+++ b/sima/utils/blcli.py
@@ -21,7 +21,7 @@ import atexit
 import sys
 
 # local import
-from ..mpdclient import MPD, MPDError, Artist, Album
+from ..mpdclient import MPD, PlayerError, Artist, Album
 from ..lib.simadb import SimaDB
 
 
@@ -37,7 +37,7 @@ class BLCli(MPD):
             return
         try:
             getattr(self, cmd.replace('-', '_'))()
-        except MPDError as err:
+        except PlayerError as err:
             self.log.error(err)
             sys.exit(1)
 

diff --git a/sima/utils/configtest.py b/sima/utils/configtest.py
index b777276afeae58ce3bf6d297273ce4681c3eb8d6..ef91241b86a357b1165966224408b14ad1f50123 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,7 +22,7 @@ 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)
         sys.exit(1)