From 694bac50ffa7847e9c2abefe736e8580e19713f8 Mon Sep 17 00:00:00 2001 From: Iv Date: Mon, 23 May 2022 15:51:25 -0400 Subject: [PATCH 1/2] Fix typo --- stagger/tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stagger/tags.py b/stagger/tags.py index 3949d99..58aa444 100644 --- a/stagger/tags.py +++ b/stagger/tags.py @@ -359,7 +359,7 @@ def values(self): disc_total = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) composer = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) genre = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) - comment = abstractproperty(fget=lambda self: Non, fset=lambda self, value: None) + comment = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) grouping = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) picture = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) sort_title = abstractproperty(fget=lambda self: None, fset=lambda self, value: None) From 47b4ccf6dc50e6c69ba369406bd1aaea45a1dca8 Mon Sep 17 00:00:00 2001 From: iv Date: Fri, 1 Dec 2023 22:34:54 -0500 Subject: [PATCH 2/2] fix: update for py3.10 collections breaking change --- stagger/frames.py | 4 ++-- stagger/tags.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stagger/frames.py b/stagger/frames.py index f2b914e..d304de9 100644 --- a/stagger/frames.py +++ b/stagger/frames.py @@ -114,7 +114,7 @@ def _in_version(self, *versions): "Returns true if this frame is in any of the specified versions of ID3." for version in versions: if (self._version == version - or (isinstance(self._version, collections.Container) + or (isinstance(self._version, collections.abc.Container) and version in self._version)): return True return False @@ -244,7 +244,7 @@ def extract_strs(values): return if isinstance(values, str): yield values - elif isinstance(values, collections.Iterable): + elif isinstance(values, collections.abc.Iterable): for val in values: for v in extract_strs(val): yield v diff --git a/stagger/tags.py b/stagger/tags.py index 58aa444..983d4d4 100644 --- a/stagger/tags.py +++ b/stagger/tags.py @@ -219,7 +219,7 @@ def __repr__(self): return "".format(", ".join(pair[0] for pair in order)) -class Tag(collections.MutableMapping, metaclass=abc.ABCMeta): +class Tag(collections.abc.MutableMapping, metaclass=abc.ABCMeta): known_frames = { } # Maps known frameids to Frame class objects frame_order = None # Initialized by stagger.id3 @@ -316,7 +316,7 @@ def __setitem__(self, key, value): self._frames[key] = [value] return if self.known_frames[key]._allow_duplicates: - if not isinstance(value, collections.Iterable) or isinstance(value, str): + if not isinstance(value, collections.abc.Iterable) or isinstance(value, str): raise ValueError("{0} requires a list of frame values".format(key)) self._frames[key] = [val if isinstance(val, self.known_frames[key]) else self.known_frames[key](val)