linux-kernel - [PATCH] scripts: spdxcheck: resovle decode warning for python3

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon,  1 Oct 2018 14:08:46 +0530
From:   Shubham Singh <dhoni.singh094@...il.com>
To:     tglx@...utronix.de
Cc:     akpm@...ux-foundation.org, jcline@...hat.com,
        gregkh@...uxfoundation.org, linux-kernel@...r.kernel.org,
        shubhsherl <dhoni.singh094@...il.com>
Subject: [PATCH] scripts: spdxcheck: resovle decode warning for python3

From: shubhsherl <dhoni.singh094@...il.com>

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

Signed-off-by: Shubham Singh <dhoni.singh094@...il.com>
---
 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