summaryrefslogtreecommitdiff
path: root/python/magic.py
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2016-11-07 07:26:06 +0000
committerXin LI <delphij@FreeBSD.org>2016-11-07 07:26:06 +0000
commit46a30e2e108c3996f8c1ef41888011c2a5cedaf7 (patch)
treed5b3320c0abb93ce4b48892c8cf3704e4a3ed009 /python/magic.py
parent581c312f134935d421daea8ff9efe57e66a2beab (diff)
Notes
Diffstat (limited to 'python/magic.py')
-rw-r--r--python/magic.py6
1 files changed, 3 insertions, 3 deletions
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):
"""