From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 20 Jun 2013 07:05:34 +0000 (-0700)
Subject: chpathtool: fix mime_type TypeError, bug #473892
X-Git-Tag: v2.2.0_alpha183
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a6b69cf6ac36c262e253ce701dd9db5a24d0f25;p=portage.git

chpathtool: fix mime_type TypeError, bug #473892
---

diff --git a/bin/chpathtool.py b/bin/chpathtool.py
index 85e608ea9..a040babfb 100755
--- a/bin/chpathtool.py
+++ b/bin/chpathtool.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 2011-2012 Gentoo Foundation
+# Copyright 2011-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import io
@@ -41,6 +41,8 @@ class IsTextFile(object):
 
 	def _is_text_magic(self, filename):
 		mime_type = self._m.file(filename)
+		if isinstance(mime_type, bytes):
+			mime_type = mime_type.decode('ascii', 'replace')
 		return mime_type.startswith("text/")
 
 	def _is_text_encoding(self, filename):