From 33d451ed2d736702acb97cf21a217522bacd6c57 Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Sat, 18 Jun 2016 02:11:24 -0400 Subject: [PATCH] switch basestring for bytes in HumanReadableException We already check for unicode first, so this shouldn't cause any issues on py2 --- beets/util/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beets/util/__init__.py b/beets/util/__init__.py index 9bd4ca529..0628f324b 100644 --- a/beets/util/__init__.py +++ b/beets/util/__init__.py @@ -67,7 +67,7 @@ class HumanReadableException(Exception): """Get the reason as a string.""" if isinstance(self.reason, unicode): return self.reason - elif isinstance(self.reason, basestring): # Byte string. + elif isinstance(self.reason, bytes): return self.reason.decode('utf8', 'ignore') elif hasattr(self.reason, 'strerror'): # i.e., EnvironmentError return self.reason.strerror