mpd.py: strip trailing \n from MPD's hello line for a nicer error message

[python-musicpd.git] / mpd.py

diff --git a/mpd.py b/mpd.py
index ae1f2b3c349a6360127ecd06f86451432d3f453d..c924b3c758940ba4a1d4d43014339dc34e92cce7 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -275,6 +275,7 @@ class MPDClient(object):
         line = self._rfile.readline()
         if not line.endswith("\n"):
             raise ConnectionError, "Connection lost while reading MPD hello"
+        line = line.rstrip("\n")
         if not line.startswith(HELLO_PREFIX):
             raise ProtocolError, "Got invalid MPD hello: '%s'" % line
         self.mpd_version = line[len(HELLO_PREFIX):].strip()
@@ -307,7 +308,11 @@ class MPDClient(object):
             raise socket.error, msg
         self._rfile = self._sock.makefile("rb")
         self._wfile = self._sock.makefile("wb")
-        self._hello()
+        try:
+            self._hello()
+        except (socket.error, MPDError):
+            self.disconnect()
+            raise
 
     def disconnect(self):
         self._rfile.close()