Fix bug that breaks file's Python bindings when using Python 3. This patch
should not be applied when using Python 2.

Copied from upstream source repository:

https://github.com/file/file/commit/73e043d2a986234b187a00ed0c8d1f7bf83df372

From 73e043d2a986234b187a00ed0c8d1f7bf83df372 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 28 Jun 2016 17:10:22 +0000
Subject: [PATCH] PR/562: Reiner Herrmann: Avoid double encoding with python3

---
 python/magic.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/magic.py b/python/magic.py
index c48f7d5..b0f7a17 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):
         """
-- 
2.10.1

48649fa582474db65fed2268'>commit</a><a href='/guix/diff/build-aux/pre-inst-env.in?id=8150ebedb8b87bcc48649fa582474db65fed2268'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/pre-inst-env.in'>
<input type='hidden' name='id' value='8150ebedb8b87bcc48649fa582474db65fed2268'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8150ebedb8b87bcc48649fa582474db65fed2268'>root</a>/<a href='/guix/log/build-aux?id=8150ebedb8b87bcc48649fa582474db65fed2268'>build-aux</a>/<a href='/guix/log/build-aux/pre-inst-env.in?id=8150ebedb8b87bcc48649fa582474db65fed2268'>pre-inst-env.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/pre-inst-env.in?id=8150ebedb8b87bcc48649fa582474db65fed2268&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=82f903e70f580c34503052245625354d2f097d7e'>daemon: Remove 'NIX_LIBEXEC_DIR'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=bc69ea2d605810cc32e13ed03d5848b8dc358b61'>daemon: Run 'guix offload' directly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=2e3e5d21988fc2cafb2a9eaf4b00976ea425629d'>daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 16:20:01 +0100'>2019-02-04</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=959eaa1eb834fd47ceab3c5bbbe4967e808d530b'>daemon: Add "/guix" to default 'nixLibexecDir'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-02-04 16:20:01 +0100'>2019-02-04</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=4d4a38f620520acc787ff5db2be3736923e14235'>daemon: Remove the 'NIX_SUBSTITUTERS' environment variable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-10-10 23:16:07 -0500'>2017-10-10</span></td><td><a href='/guix/commit/build-aux/pre-inst-env.in?id=7740228e3523e3e0e4c007eb1f1b224575d16574'>build: Set 'NIX_BUILD_HOOK' only if offloading is configured.</a><span class='msg-avail'>...</span></td><td>Eric Bavier</td></tr>