From 17927303ed9ebd4fa4127347d90e9c44b29f0c7a Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 1 Jul 2016 21:21:31 -0700
Subject: [PATCH] Store Vorbis image blocks using text strings

---
 beets/mediafile.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/beets/mediafile.py b/beets/mediafile.py
index 7d7661bb2..d8529ecb8 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -955,7 +955,11 @@ class VorbisImageStorageStyle(ListStorageStyle):
         pic.type = image.type_index
         pic.mime = image.mime_type
         pic.desc = image.desc or u''
-        return base64.b64encode(pic.write())
+
+        # Encoding with base64 returns bytes on both Python 2 and 3.
+        # Mutagen requires the data to be a Unicode string, so we decode
+        # it before passing it along.
+        return base64.b64encode(pic.write()).decode('ascii')
 
 
 class FlacImageStorageStyle(ListStorageStyle):