From 44e0e441080da8057260cea7a9225e03e93ffca0 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Tue, 28 Jun 2016 20:22:58 -0700
Subject: [PATCH] Enforce type of ID3 `desc` fields

---
 beets/mediafile.py     | 3 ++-
 test/test_mediafile.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/beets/mediafile.py b/beets/mediafile.py
index f13287a86..32d2abc90 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -754,6 +754,7 @@ class MP3DescStorageStyle(MP3StorageStyle):
     selected based its ``desc`` field.
     """
     def __init__(self, desc=u'', key='TXXX', **kwargs):
+        assert isinstance(desc, six.text_type)
         self.description = desc
         super(MP3DescStorageStyle, self).__init__(key=key, **kwargs)
 
@@ -1702,7 +1703,7 @@ class MediaFile(object):
         ASFStorageStyle('WM/Language'),
     )
     country = MediaField(
-        MP3DescStorageStyle('MusicBrainz Album Release Country'),
+        MP3DescStorageStyle(u'MusicBrainz Album Release Country'),
         MP4StorageStyle('----:com.apple.iTunes:MusicBrainz '
                         'Album Release Country'),
         StorageStyle('RELEASECOUNTRY'),
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index 7a299a1d0..5a6100c54 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -299,7 +299,7 @@ class GenreListTestMixin(object):
 
 
 field_extension = MediaField(
-    MP3DescStorageStyle('customtag'),
+    MP3DescStorageStyle(u'customtag'),
     MP4StorageStyle('----:com.apple.iTunes:customtag'),
     StorageStyle('customtag'),
     ASFStorageStyle('customtag'),