summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2016-06-28 17:10:22 +0000
committerChristos Zoulas <christos@zoulas.com>2016-06-28 17:10:22 +0000
commit73e043d2a986234b187a00ed0c8d1f7bf83df372 (patch)
treeb052feac43d05f797007a7b43e3eda06a2cbb89e /python
parent1222ebc09f8010d7071f6873d0019f7fc2b18e02 (diff)
downloadfile-git-73e043d2a986234b187a00ed0c8d1f7bf83df372.tar.gz
PR/562: Reiner Herrmann: Avoid double encoding with python3
Diffstat (limited to 'python')
-rw-r--r--python/magic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/python/magic.py b/python/magic.py
index c48f7d5a..b0f7a176 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):
"""