From 7df59d5e305d8725d8313d669799d424c9afa3e5 Mon Sep 17 00:00:00 2001
From: Johnny Robeson <johnny@localmomentum.net>
Date: Wed, 15 Jun 2016 01:12:28 -0400
Subject: [PATCH] catch codecs hex encoding errors too (from binascii)

binascii is used internally by codecs, and I didn't initially know that
---
 beets/mediafile.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/beets/mediafile.py b/beets/mediafile.py
index f55c9e821..1251cee26 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -49,6 +49,7 @@ import codecs
 import datetime
 import re
 import base64
+import binascii
 import math
 import struct
 import imghdr
@@ -225,7 +226,7 @@ def _sc_decode(soundcheck):
     try:
         soundcheck = codecs.decode(soundcheck.replace(b' ', b''), 'hex')
         soundcheck = struct.unpack('!iiiiiiiiii', soundcheck)
-    except (struct.error, TypeError):
+    except (struct.error, TypeError, binascii.Error):
         # SoundCheck isn't in the format we expect, so return default
         # values.
         return 0.0, 0.0