diff options
author | delphij <delphij@FreeBSD.org> | 2016-12-11 07:33:02 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-12-11 07:33:02 +0000 |
commit | 6deb05a98d247385fa8f1b418199fc619cf40a8f (patch) | |
tree | 7388da32748fcb12b1e5a9251297ca9dc18ac284 /contrib/file/python | |
parent | 5e2d8ce3d45ee17a1f4045573bd1b42e6341bfcb (diff) | |
download | FreeBSD-src-6deb05a98d247385fa8f1b418199fc619cf40a8f.zip FreeBSD-src-6deb05a98d247385fa8f1b418199fc619cf40a8f.tar.gz |
MFC r308420: MFV r308392: file 5.29.
Diffstat (limited to 'contrib/file/python')
-rw-r--r-- | contrib/file/python/magic.py | 6 |
1 files changed, 3 insertions, 3 deletions
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): """ |