Remove redundant unicode decode

These days musicbrainz returns unicode strings as expected.
This commit is contained in:
Šarūnas Nejus 2024-08-04 15:03:53 +01:00
parent 8f44568ddd
commit f006476dcf
No known key found for this signature in database
GPG key ID: DD28F6704DBE3435
2 changed files with 0 additions and 56 deletions

View file

@ -168,42 +168,6 @@ class AlbumInfo(AttrDict):
self.discogs_artistid = discogs_artistid
self.update(kwargs)
# Work around a bug in python-musicbrainz-ngs that causes some
# strings to be bytes rather than Unicode.
# https://github.com/alastair/python-musicbrainz-ngs/issues/85
def decode(self, codec: str = "utf-8"):
"""Ensure that all string attributes on this object, and the
constituent `TrackInfo` objects, are decoded to Unicode.
"""
for fld in [
"album",
"artist",
"albumtype",
"label",
"barcode",
"artist_sort",
"catalognum",
"script",
"language",
"country",
"style",
"genre",
"albumstatus",
"albumdisambig",
"releasegroupdisambig",
"artist_credit",
"media",
"discogs_albumid",
"discogs_labelid",
"discogs_artistid",
]:
value = getattr(self, fld)
if isinstance(value, bytes):
setattr(self, fld, value.decode(codec, "ignore"))
for track in self.tracks:
track.decode(codec)
def copy(self) -> AlbumInfo:
dupe = AlbumInfo([])
dupe.update(self)
@ -294,24 +258,6 @@ class TrackInfo(AttrDict):
self.album = album
self.update(kwargs)
# As above, work around a bug in python-musicbrainz-ngs.
def decode(self, codec="utf-8"):
"""Ensure that all string attributes on this object are decoded
to Unicode.
"""
for fld in [
"title",
"artist",
"medium",
"artist_sort",
"disctitle",
"artist_credit",
"media",
]:
value = getattr(self, fld)
if isinstance(value, bytes):
setattr(self, fld, value.decode(codec, "ignore"))
def copy(self) -> TrackInfo:
dupe = TrackInfo()
dupe.update(self)

View file

@ -372,7 +372,6 @@ def track_info(
for extra_trackdata in extra_trackdatas:
info.update(extra_trackdata)
info.decode()
return info
@ -683,7 +682,6 @@ def album_info(release: Dict) -> beets.autotag.hooks.AlbumInfo:
for extra_albumdata in extra_albumdatas:
info.update(extra_albumdata)
info.decode()
return info