Removed useless exception catch in client

[mpd-sima.git] / sima / client.py

diff --git a/sima/client.py b/sima/client.py
index 3ae7d9261672f3fe7f5d77e2498f47ebfe0b3158..9c12f8be1a9e55456636a6bb88fac9d76a6d0587 100644 (file)
--- a/sima/client.py
+++ b/sima/client.py
@@ -136,7 +136,6 @@ class PlayerClient(Player):
                           "search", "sticker find",]
         track_obj = ['currentsong']
         if self._comm in tracks_listing + track_obj:
-            # pylint: disable=star-args
             if isinstance(ans, list):
                 return [Track(**track) for track in ans]
             elif isinstance(ans, dict):
@@ -287,7 +286,7 @@ class PlayerClient(Player):
             kwalbart = {'albumartist':name, 'artist':name}
             for album in self.list('album', 'albumartist', artist):
                 if album and album not in albums:
-                    albums.append(Album(name=album, **kwalbart))  # pylint: disable=star-args
+                    albums.append(Album(name=album, **kwalbart))
             for album in self.list('album', 'artist', artist):
                 album_trks = [trk for trk in self.find('album', album)]
                 if 'Various Artists' in [tr.albumartist for tr in album_trks]:
@@ -379,18 +378,8 @@ class PlayerClient(Player):
         if password:
             try:
                 self._client.password(password)
-
-            # Catch errors with the password command (e.g., wrong password)
-            except CommandError as err:
-                raise PlayerError("Could not connect to '%s': "
-                                  "password command failed: %s" %
-                                  (host, err))
-
-            # Catch all other possible errors
             except (MPDError, IOError) as err:
-                raise PlayerError("Could not connect to '%s': "
-                                  "error with password command: %s" %
-                                  (host, err))
+                raise PlayerError("Could not connect to '%s': %s", (host, err))
         # Controls we have sufficient rights
         needed_cmds = ['status', 'stats', 'add', 'find', \
                        'search', 'currentsong', 'ping']