From b0c0a292912ec9a94f3d7080be93880ef94ea801 Mon Sep 17 00:00:00 2001 From: Martin Wagner Date: Thu, 4 May 2023 18:16:36 +0200 Subject: [PATCH] removed workaround for python-mpd2<3.1 --- requirements.txt | 2 +- src/mpdevil.py | 31 ------------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/requirements.txt b/requirements.txt index 01ca474..1b55861 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -python-mpd2 >=1.1 +python-mpd2 >=3.1 PyGObject pycairo diff --git a/src/mpdevil.py b/src/mpdevil.py index de57103..7261631 100755 --- a/src/mpdevil.py +++ b/src/mpdevil.py @@ -661,37 +661,6 @@ class Client(MPDClient): # connect self._settings.connect("changed::socket-connection", lambda *args: self.reconnect()) - # workaround for list group - # see: https://github.com/Mic92/python-mpd2/pull/187 - def _parse_objects(self, lines, delimiters=[], lookup_delimiter=False): - obj = {} - for key, value in self._parse_pairs(lines): - key = key.lower() - if lookup_delimiter and key not in delimiters: - delimiters = delimiters + [key] - if obj: - if key in delimiters: - if lookup_delimiter: - if key in obj: - yield obj - obj = obj.copy() - while delimiters[-1] != key: - obj.pop(delimiters[-1], None) - delimiters.pop() - else: - yield obj - obj = {} - elif key in obj: - if not isinstance(obj[key], list): - obj[key] = [obj[key], value] - else: - obj[key].append(value) - continue - obj[key] = value - if obj: - yield obj - _parse_objects_direct = _parse_objects - # overloads to use Song class def currentsong(self, *args): return Song(super().currentsong(*args))