2018-10-01 08:39:36

by Shubham Singh

Subject: [PATCH] scripts: spdxcheck: resovle decode warning for python3

From: shubhsherl <[email protected]>

Resolve a warning issue by spdxcheck in Python3
FAIL: 'str' object has no attribute 'decode'

Signed-off-by: Shubham Singh <[email protected]>
---
scripts/spdxcheck.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 839e190bbd7a..6eea4073f28a 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -168,7 +168,8 @@ class id_parser(object):
self.curline = 0
try:
for line in fd:
- line = line.decode(locale.getpreferredencoding(False), errors='ignore')
+ if type(line) != str:
+ line = line.decode(locale.getpreferredencoding(False), errors='ignore')
self.curline += 1
if self.curline > maxlines:
break
--
2.18.0

2018-10-01 14:30:04

by Jeremy Cline

Subject: Re: [PATCH] scripts: spdxcheck: resovle decode warning for python3

Hi Shubham,

On 10/01/2018 04:38 AM, Shubham Singh wrote:
> From: shubhsherl <[email protected]>
>
> Resolve a warning issue by spdxcheck in Python3
> FAIL: 'str' object has no attribute 'decode'
>
> Signed-off-by: Shubham Singh <[email protected]>
> ---
> scripts/spdxcheck.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
> index 839e190bbd7a..6eea4073f28a 100755
> --- a/scripts/spdxcheck.py
> +++ b/scripts/spdxcheck.py
> @@ -168,7 +168,8 @@ class id_parser(object):
> self.curline = 0
> try:
> for line in fd:
> - line = line.decode(locale.getpreferredencoding(False), errors='ignore')
> + if type(line) != str:
> + line = line.decode(locale.getpreferredencoding(False), errors='ignore')
> self.curline += 1
> if self.curline > maxlines:
> break
>

This looks to be a fix for the same issue addressed by
"[PATCH] scripts/spdxcheck.py: improve Python 3 compat"[0].

Can you reproduce the warning with that patch?

[0] https://marc.info/?l=linux-kernel&m=153713239404809