diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-14 13:59:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-14 13:59:40 -0200 |
| commit | cc9fac304cafadab4656653aa1a62fdad74b4e94 (patch) | |
| tree | 43fee446af0c829986548dcbe6862d3ac31bae2e /contrib/file/python/magic.py | |
| parent | 812767d2bb4e201b4f826fd31924d2cafb8fe0ae (diff) | |
| parent | 6d3cdf0ab519f1b7bad6bd132eda48242f0ff7c8 (diff) | |
| download | FreeBSD-src-cc9fac304cafadab4656653aa1a62fdad74b4e94.zip FreeBSD-src-cc9fac304cafadab4656653aa1a62fdad74b4e94.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/file/python/magic.py')
| -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): """ |
