[gentoo-portage-dev] [PATCH] checksum._open_file: fix BytesWarning

[gentoo-portage-dev] [PATCH] checksum._open_file: fix BytesWarning

[Zac Medico]

Fix the following warning message:

pym/portage/checksum.py:25: BytesWarning: str() on a bytes instance
  func_call = "open('%s')" % filename
---
 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:
-- 
2.4.6

Re: [gentoo-portage-dev] [PATCH] checksum._open_file: fix BytesWarning

[Brian Dolbec]

On Thu,  1 Oct 2015 13:55:42 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> Fix the following warning message:
> 
> pym/portage/checksum.py:25: BytesWarning: str() on a bytes instance
>   func_call = "open('%s')" % filename
> ---
>  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:


yeah,looks good.

Also for trivial patches like this, there is no need for review.
-- 
Brian Dolbec <dolsen>