commit: ee0ac6e6b18438098070d9162d6939832f2d14ed
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 1 20:53:15 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 05:05:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee0ac6e6
checksum._open_file: fix BytesWarning
Fix the following warning message:
pym/portage/checksum.py:25: BytesWarning: str() on a bytes instance
func_call = "open('%s')" % filename
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/portage/checksum.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
index 642602e..cdf4670 100644
--- a/pym/portage/checksum.py
+++ b/pym/portage/checksum.py
@@ -7,7 +7,7 @@ from portage.const import PRELINK_BINARY, HASHING_BLOCKSIZE
from portage.localization import _
from portage import os
from portage import _encodings
-from portage import _unicode_encode
+from portage import _unicode_decode, _unicode_encode
import errno
import stat
import subprocess
@@ -22,7 +22,7 @@ def _open_file(filename):
return open(_unicode_encode(filename,
encoding=_encodings['fs'], errors='strict'), 'rb')
except IOError as e:
- func_call = "open('%s')" % filename
+ func_call = "open('%s')" % _unicode_decode(filename)
if e.errno == errno.EPERM:
raise portage.exception.OperationNotPermitted(func_call)
elif e.errno == errno.EACCES:
