4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
commit 6f4d29df66acd49303a99025046b85cabe7aa17a upstream.
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.
/usr/bin/python on Arch is Python 3. So this would indeed be worth
going into 4.19.
Link:
http://lkml.kernel.org/r/20181023070802.22558-1-u.kleine-koe...@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Joe Perches <j...@perches.com>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
scripts/spdxcheck.py | 1 -
1 file changed, 1 deletion(-)
--- 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
