From 28c0c95ed9a02618bd5bdc655a2b0230250e0ff6 Mon Sep 17 00:00:00 2001
From: Johnny Robeson <johnny@localmomentum.net>
Date: Mon, 30 May 2016 03:06:17 -0400
Subject: [PATCH] remove b' from struct (un)packing calls

---
 beets/mediafile.py   | 6 +++---
 beets/ui/__init__.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/beets/mediafile.py b/beets/mediafile.py
index c9489501e..a359a5b4f 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -181,7 +181,7 @@ def _unpack_asf_image(data):
     of exceptions (out-of-bounds, etc.). We should clean this up
     sometime so that the failure modes are well-defined.
     """
-    type, size = struct.unpack_from(b'<bi', data)
+    type, size = struct.unpack_from('<bi', data)
     pos = 5
     mime = ""
     while data[pos:pos + 2] != b'\x00\x00':
@@ -201,7 +201,7 @@ def _unpack_asf_image(data):
 def _pack_asf_image(mime, data, type=3, description=""):
     """Pack image data for a WM/Picture tag.
     """
-    tag_data = struct.pack(b'<bi', type, len(data))
+    tag_data = struct.pack('<bi', type, len(data))
     tag_data += mime.encode("utf-16-le") + b'\x00\x00'
     tag_data += description.encode("utf-16-le") + b'\x00\x00'
     tag_data += data
@@ -223,7 +223,7 @@ def _sc_decode(soundcheck):
     # characters of ASCII hex preceded by a space.
     try:
         soundcheck = soundcheck.replace(b' ', b'').decode('hex')
-        soundcheck = struct.unpack(b'!iiiiiiiiii', soundcheck)
+        soundcheck = struct.unpack('!iiiiiiiiii', soundcheck)
     except (struct.error, TypeError):
         # SoundCheck isn't in the format we expect, so return default
         # values.
diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 291f93208..e82f48434 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -636,7 +636,7 @@ def term_width():
     except IOError:
         return fallback
     try:
-        height, width = struct.unpack(b'hh', buf)
+        height, width = struct.unpack('hh', buf)
     except struct.error:
         return fallback
     return width