python3 conversion

[python-musicpd.git] / mpd.py

diff --git a/mpd.py b/mpd.py
index 05a78297d82a4d477d9ede7eea1d09b21d90f6a8..674f71451cf18af4677d01df3da5a0a859f4aea6 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -171,7 +171,9 @@ class MPDClient(object):
             raise CommandListError("Cannot use send_%s in a command list" %
                                    command.replace(" ", "_"))
         self._write_command(command, args)
-        self._pending.append(command)
+        retval = self._commands[command]
+        if retval is not None:
+            self._pending.append(command)
 
     def _fetch(self, command, args=None):
         if self._command_list is not None:
@@ -189,6 +191,7 @@ class MPDClient(object):
         retval = self._commands[command]
         if callable(retval):
             return retval()
+        return retval
 
     def _execute(self, command, args):
         if self._iterating:
@@ -393,7 +396,8 @@ class MPDClient(object):
                 sock = socket.socket(af, socktype, proto)
                 sock.connect(sa)
                 return sock
-            except socket.error, err:
+            except socket.error as socket_err:
+                err = socket_err
                 if sock is not None:
                     sock.close()
         if err is not None:
@@ -408,8 +412,8 @@ class MPDClient(object):
             self._sock = self._connect_unix(host)
         else:
             self._sock = self._connect_tcp(host, port)
-        self._rfile = self._sock.makefile("rb")
-        self._wfile = self._sock.makefile("wb")
+        self._rfile = self._sock.makefile("r")
+        self._wfile = self._sock.makefile("w")
         try:
             self._hello()
         except: