From f006476dcf7b1950c6ffbd0767c465278f3c3618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= <snejus@protonmail.com>
Date: Sun, 4 Aug 2024 15:03:53 +0100
Subject: [PATCH] Remove redundant unicode decode

These days musicbrainz returns unicode strings as expected.
---
 beets/autotag/hooks.py | 54 ------------------------------------------
 beets/autotag/mb.py    |  2 --
 2 files changed, 56 deletions(-)

diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index efd71da9b..0a9b7daf4 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -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)
diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index 9d3fe6d43..0d0eb975f 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -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