diff options
Diffstat (limited to 'nephilim/mpd.py')
| -rw-r--r-- | nephilim/mpd.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/nephilim/mpd.py b/nephilim/mpd.py index 129c82e..cae2bcb 100644 --- a/nephilim/mpd.py +++ b/nephilim/mpd.py @@ -48,7 +48,6 @@ class _NotConnected(object): class MPDClient(object): def __init__(self): - self.iterate = False self._reset() self._commands = { # Admin Commands @@ -228,11 +227,6 @@ class MPDClient(object): self._getnone() raise StopIteration - def _wrapiterator(self, iterator): - if not self.iterate: - return list(iterator) - return iterator - def _getnone(self): line = self._readline() if line is not None: @@ -245,10 +239,10 @@ class MPDClient(object): return items[0][1] def _getlist(self): - return self._wrapiterator(self._readlist()) + return self._readlist() def _getplaylist(self): - return self._wrapiterator(self._readplaylist()) + return self._readplaylist() def _getobject(self): objs = list(self._readobjects()) @@ -257,7 +251,7 @@ class MPDClient(object): return objs[0] def _getobjects(self, delimiters): - return self._wrapiterator(self._readobjects(delimiters)) + return self._readobjects(delimiters) def _getsongs(self): return self._getobjects(["file"]) @@ -273,7 +267,7 @@ class MPDClient(object): def _getcommandlist(self): try: - return self._wrapiterator(self._readcommandlist()) + return self._readcommandlist() except CommandError: self._commandlist = None raise |