[PATCH] scripts/spdxcheck: make python3 compliant

[PATCH] scripts/spdxcheck: make python3 compliant

[Uwe Kleine-König]

Without this change the following happens when using Python3 (3.6.6):

	$ echo "GPL-2.0" | python3 scripts/spdxcheck.py -
	FAIL: 'str' object has no attribute 'decode'
	Traceback (most recent call last):
	  File "scripts/spdxcheck.py", line 253, in <module>
	    parser.parse_lines(sys.stdin, args.maxlines, '-')
	  File "scripts/spdxcheck.py", line 171, in parse_lines
	    line = line.decode(locale.getpreferredencoding(False), errors='ignore')
	AttributeError: 'str' object has no attribute 'decode'

So as the line is already a string, there is no need to decode it and
the line can be dropped.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/spdxcheck.py | 1 -
 1 file changed, 1 deletion(-)

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

Re: [PATCH] scripts/spdxcheck: make python3 compliant

[Andrew Morton]

On Tue, 23 Oct 2018 09:08:02 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:

> Without this change the following happens when using Python3 (3.6.6):
> 
> 	$ echo "GPL-2.0" | python3 scripts/spdxcheck.py -
> 	FAIL: 'str' object has no attribute 'decode'
> 	Traceback (most recent call last):
> 	  File "scripts/spdxcheck.py", line 253, in <module>
> 	    parser.parse_lines(sys.stdin, args.maxlines, '-')
> 	  File "scripts/spdxcheck.py", line 171, in parse_lines
> 	    line = line.decode(locale.getpreferredencoding(False), errors='ignore')
> 	AttributeError: 'str' object has no attribute 'decode'
> 
> So as the line is already a string, there is no need to decode it and
> the line can be dropped.

I suppose people might want to run spdxcheck.py against (say) 4.19.x
using python3.  So I'll add a cc:stable here, OK?

Re: [PATCH] scripts/spdxcheck: make python3 compliant

[Uwe Kleine-König]

Hello Andrew,

On Wed, Nov 07, 2018 at 03:32:51PM -0800, Andrew Morton wrote:
> On Tue, 23 Oct 2018 09:08:02 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> 
> > Without this change the following happens when using Python3 (3.6.6):
> > 
> > 	$ echo "GPL-2.0" | python3 scripts/spdxcheck.py -
> > 	FAIL: 'str' object has no attribute 'decode'
> > 	Traceback (most recent call last):
> > 	  File "scripts/spdxcheck.py", line 253, in <module>
> > 	    parser.parse_lines(sys.stdin, args.maxlines, '-')
> > 	  File "scripts/spdxcheck.py", line 171, in parse_lines
> > 	    line = line.decode(locale.getpreferredencoding(False), errors='ignore')
> > 	AttributeError: 'str' object has no attribute 'decode'
> > 
> > So as the line is already a string, there is no need to decode it and
> > the line can be dropped.
> 
> I suppose people might want to run spdxcheck.py against (say) 4.19.x
> using python3.  So I'll add a cc:stable here, OK?

Not sure if people call spdxcheck.py stand-alone. checkpatch.pl calls it
using "python scripts/spdxcheck.py" which AFAICT should still be python2
on all machines. The shebang-line also uses "python" and not "python3".

So for now this is only cosmetic (unless there are distros that install
Python 3 as "python").

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: [PATCH] scripts/spdxcheck: make python3 compliant

[Uwe Kleine-König]

Hello,

On Thu, Nov 08, 2018 at 07:22:00AM +0100, Uwe Kleine-König wrote:
> On Wed, Nov 07, 2018 at 03:32:51PM -0800, Andrew Morton wrote:
> > On Tue, 23 Oct 2018 09:08:02 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> > 
> > > Without this change the following happens when using Python3 (3.6.6):
> > > 
> > > 	$ echo "GPL-2.0" | python3 scripts/spdxcheck.py -
> > > 	FAIL: 'str' object has no attribute 'decode'
> > > 	Traceback (most recent call last):
> > > 	  File "scripts/spdxcheck.py", line 253, in <module>
> > > 	    parser.parse_lines(sys.stdin, args.maxlines, '-')
> > > 	  File "scripts/spdxcheck.py", line 171, in parse_lines
> > > 	    line = line.decode(locale.getpreferredencoding(False), errors='ignore')
> > > 	AttributeError: 'str' object has no attribute 'decode'
> > > 
> > > So as the line is already a string, there is no need to decode it and
> > > the line can be dropped.
> > 
> > I suppose people might want to run spdxcheck.py against (say) 4.19.x
> > using python3.  So I'll add a cc:stable here, OK?
> 
> Not sure if people call spdxcheck.py stand-alone. checkpatch.pl calls it
> using "python scripts/spdxcheck.py" which AFAICT should still be python2
> on all machines. The shebang-line also uses "python" and not "python3".
> 
> So for now this is only cosmetic (unless there are distros that install
> Python 3 as "python").

I just learned that /usr/bin/python on Arch is Python 3. So this would
indeed be worth to go into 4.19.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |