Return str rather than bytes for the description strings on python3.

Assumes utf-8 encoding from magic return values, which I hope is
always the case.

1 files changed, 10 insertions, 2 deletions

diff --git a/magic.py b/magic.py
index 9e5f81f..7470b93 100644
--- a/magic.py
+++ b/magic.py
@@ -72,7 +72,7 @@ class Magic:
         """
         with self.lock:
             try:
-                return magic_buffer(self.cookie, buf)
+                return maybe_decode(magic_buffer(self.cookie, buf))
             except MagicException as e:
                 return self._handle509Bug(e)
 
@@ -82,7 +82,7 @@ class Magic:
             pass
         with self.lock:
             try:
-                return magic_file(self.cookie, filename)
+                return maybe_decode(magic_file(self.cookie, filename))
             except MagicException as e:
                 return self._handle509Bug(e)
 
@@ -189,6 +189,14 @@ def errorcheck_negative_one(result, func, args):
         return result
 
 
+# return str on python3.  Don't want to unconditionally
+# decode because that results in unicode on python2
+def maybe_decode(s):
+    if str == bytes:
+        return s
+    else:
+        return s.decode('utf-8')
+    
 def coerce_filename(filename):
     if filename is None:
         return None