diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2015-10-01 13:53:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2015-10-01 22:05:54 -0700 |
| commit | ee0ac6e6b18438098070d9162d6939832f2d14ed (patch) | |
| tree | f11768d6c8a04aeb30be9f997cc2e24992138277 | |
| parent | Revert "unpack: avoid useless chmods to improve speed" (diff) | |
| download | portage-ee0ac6e6.tar.gz portage-ee0ac6e6.tar.bz2 portage-ee0ac6e6.zip | |
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@gentoo.org>
| -rw-r--r-- | pym/portage/checksum.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py index 642602ea1..cdf467003 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: |