From 884efc61f7391700d81bb717ea62d897524b2184 Mon Sep 17 00:00:00 2001 From: delphij Date: Sun, 11 Dec 2016 07:37:20 +0000 Subject: MFC r308420: MFV r308392: file 5.29. --- contrib/file/python/magic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/file/python/magic.py') diff --git a/contrib/file/python/magic.py b/contrib/file/python/magic.py index c48f7d5..b0f7a17 100644 --- a/contrib/file/python/magic.py +++ b/contrib/file/python/magic.py @@ -134,7 +134,7 @@ class Magic(object): if isinstance(r, str): return r else: - return str(r).encode('utf-8') + return str(r, 'utf-8') def descriptor(self, fd): """ @@ -152,7 +152,7 @@ class Magic(object): if isinstance(r, str): return r else: - return str(r).encode('utf-8') + return str(r, 'utf-8') def error(self): """ @@ -163,7 +163,7 @@ class Magic(object): if isinstance(e, str): return e else: - return str(e).encode('utf-8') + return str(e, 'utf-8') def setflags(self, flags): """ -- cgit v1.1