chpathtool: fix mime_type TypeError, bug #473892 v2.2.0_alpha183
authorZac Medico <zmedico@gentoo.org>
Thu, 20 Jun 2013 07:05:34 +0000 (00:05 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 20 Jun 2013 07:05:34 +0000 (00:05 -0700)
bin/chpathtool.py

index 85e608ea99afffcc5b6b6f83e88ef6d3f975236c..a040babfb03a6944e25ef9687e5e0a10bdc7f43b 100755 (executable)
@@ -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):