X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=mpd.py;h=8b70f4aa955ffcfcf2bda81f85c642879238e76b;hp=02d27880d35759de8ea4cc960055720804703d23;hb=492dab03155b00536deebeb2916a859de62e52f7;hpb=11ad737dbfa521db07486a6cb789d3539a5ec4c0

diff --git a/mpd.py b/mpd.py
index 02d2788..8b70f4a 100644
--- a/mpd.py
+++ b/mpd.py
@@ -44,7 +44,7 @@ class _NotConnected(object):
         return self._dummy
 
     def _dummy(*args):
-        raise ConnectionError, "Not connected"
+        raise ConnectionError("Not connected")
 
 class MPDClient(object):
     def __init__(self):
@@ -126,13 +126,13 @@ class MPDClient(object):
         try:
             retval = self._commands[attr]
         except KeyError:
-            raise AttributeError, "'%s' object has no attribute '%s'" % \
-                                  (self.__class__.__name__, attr)
+            raise AttributeError("'%s' object has no attribute '%s'" %
+                                 (self.__class__.__name__, attr))
         return lambda *args: self._docommand(attr, args, retval)
 
     def _docommand(self, command, args, retval):
         if self._commandlist is not None and not callable(retval):
-            raise CommandListError, "%s not allowed in command list" % command
+            raise CommandListError("%s not allowed in command list" % command)
         self._writecommand(command, args)
         if self._commandlist is None:
             if callable(retval):
@@ -141,8 +141,8 @@ class MPDClient(object):
         self._commandlist.append(retval)
 
     def _writeline(self, line):
-        self._sockfile.write("%s\n" % line)
-        self._sockfile.flush()
+        self._wfile.write("%s\n" % line)
+        self._wfile.flush()
 
     def _writecommand(self, command, args=[]):
         parts = [command]
@@ -151,18 +151,18 @@ class MPDClient(object):
         self._writeline(" ".join(parts))
 
     def _readline(self):
-        line = self._sockfile.readline()
+        line = self._rfile.readline()
         if not line.endswith("\n"):
-            raise ConnectionError, "Connection lost while reading line"
+            raise ConnectionError("Connection lost while reading line")
         line = line.rstrip("\n")
         if line.startswith(ERROR_PREFIX):
             error = line[len(ERROR_PREFIX):].strip()
-            raise CommandError, error
+            raise CommandError(error)
         if self._commandlist is not None:
             if line == NEXT:
                 return
             if line == SUCCESS:
-                raise ProtocolError, "Got unexpected '%s'" % SUCCESS
+                raise ProtocolError("Got unexpected '%s'" % SUCCESS)
         elif line == SUCCESS:
             return
         return line
@@ -173,7 +173,7 @@ class MPDClient(object):
             return
         item = line.split(separator, 1)
         if len(item) < 2:
-            raise ProtocolError, "Could not parse item: '%s'" % line
+            raise ProtocolError("Could not parse item: '%s'" % line)
         return item
 
     def _readitems(self, separator=": "):
@@ -188,8 +188,8 @@ class MPDClient(object):
         for key, value in self._readitems():
             if key != seen:
                 if seen is not None:
-                    raise ProtocolError, "Expected key '%s', got '%s'" % \
-                                         (seen, key)
+                    raise ProtocolError("Expected key '%s', got '%s'" %
+                                        (seen, key))
                 seen = key
             yield value
         raise StopIteration
@@ -233,7 +233,7 @@ class MPDClient(object):
     def _getnone(self):
         line = self._readline()
         if line is not None:
-            raise ProtocolError, "Got unexpected return value: '%s'" % line
+            raise ProtocolError("Got unexpected return value: '%s'" % line)
 
     def _getitem(self):
         items = list(self._readitems())
@@ -272,41 +272,63 @@ class MPDClient(object):
         return self._wrapiterator(self._readcommandlist())
 
     def _hello(self):
-        line = self._sockfile.readline()
+        line = self._rfile.readline()
         if not line.endswith("\n"):
-            raise ConnectionError, "Connection lost while reading MPD hello"
+            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
+            raise ProtocolError("Got invalid MPD hello: '%s'" % line)
         self.mpd_version = line[len(HELLO_PREFIX):].strip()
 
     def _reset(self):
         self.mpd_version = None
         self._commandlist = None
         self._sock = None
-        self._sockfile = _NotConnected()
+        self._rfile = _NotConnected()
+        self._wfile = _NotConnected()
 
     def connect(self, host, port):
         if self._sock:
+            raise ConnectionError("Already connected")
+        msg = "getaddrinfo returns an empty list"
+        for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+                                      socket.SOCK_STREAM, socket.IPPROTO_TCP,
+                                      socket.AI_ADDRCONFIG):
+            af, socktype, proto, canonname, sa = res
+            try:
+                self._sock = socket.socket(af, socktype, proto)
+                self._sock.connect(sa)
+            except socket.error, msg:
+                if self._sock:
+                    self._sock.close()
+                self._sock = None
+                continue
+            break
+        if not self._sock:
+            raise socket.error(msg)
+        self._rfile = self._sock.makefile("rb")
+        self._wfile = self._sock.makefile("wb")
+        try:
+            self._hello()
+        except (socket.error, MPDError):
             self.disconnect()
-        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._sock.connect((host, port))
-        self._sockfile = self._sock.makefile("rb+")
-        self._hello()
+            raise
 
     def disconnect(self):
-        self._sockfile.close()
+        self._rfile.close()
+        self._wfile.close()
         self._sock.close()
         self._reset()
 
     def command_list_ok_begin(self):
         if self._commandlist is not None:
-            raise CommandListError, "Already in command list"
+            raise CommandListError("Already in command list")
         self._writecommand("command_list_ok_begin")
         self._commandlist = []
 
     def command_list_end(self):
         if self._commandlist is None:
-            raise CommandListError, "Not in command list"
+            raise CommandListError("Not in command list")
         self._writecommand("command_list_end")
         return self._getcommandlist()