From 46a30e2e108c3996f8c1ef41888011c2a5cedaf7 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Mon, 7 Nov 2016 07:26:06 +0000 Subject: Vendor import of file 5.29. --- python/magic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/magic.py b/python/magic.py index c48f7d5a3012..b0f7a1765e8f 100644 --- a/python/magic.py +++ b/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.3