From: J. Alexander Treuman Date: Thu, 15 Jul 2010 17:34:44 +0000 (-0400) Subject: mpd.py: tidying up _execute() X-Git-Tag: v0.3.0~29 X-Git-Url: https://git.kaliko.me/?a=commitdiff_plain;h=461fe7b8248ef8e26f3c6119a70ef8f0336d033b;p=python-musicpd.git mpd.py: tidying up _execute() --- diff --git a/mpd.py b/mpd.py index 2875f95..cb16701 100644 --- a/mpd.py +++ b/mpd.py @@ -174,14 +174,17 @@ class MPDClient(object): raise PendingCommandError("Cannot execute %s with " "pending commands" % command) retval = self._commands[command] - if self._command_list is not None and not callable(retval): - raise CommandListError("%s not allowed in command list" % command) - self._write_command(command, args) - if self._command_list is None: + if self._command_list is not None: + if not callable(retval): + raise CommandListError("%s not allowed in command list" % + command) + self._write_command(command, args) + self._command_list.append(retval) + else: + self._write_command(command, args) if callable(retval): return retval() return retval - self._command_list.append(retval) def _write_line(self, line): self._wfile.write("%s\n" % line)