NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils/check-package: drop six usage

Browse Source 
The shebang in check-package now defines python3. There is no longer a
need to maintain support with python 2.x.

See-also: 02b165dc71 (check-package: fix Python3 support)

Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Tested-by: James Knight <james.d.knight@live.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit b7d4ae98fa)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Vincent Fazio 2023-04-02 20:35:30 -05:00 committed by Peter Korsgaard
parent 410c9f01ed
commit aa658bec37
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/check-package
View File

@ -6,7 +6,6 @@ import inspect
import magic
import os
import re
import six
import sys
import checkpackagelib.base
@ -218,12 +217,9 @@ def check_file_using_lib(fname):
if fail > 0:
failed.add(name)
nwarnings += warn
if six.PY3:
f = open(fname, "r", errors="surrogateescape")
else:
f = open(fname, "r")
lastline = ""
for lineno, text in enumerate(f.readlines()):
for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()):
nlines += 1
for name, cf in objects:
if cf.disable.search(lastline):
@ -233,7 +229,7 @@ def check_file_using_lib(fname):
failed.add(name)
nwarnings += warn
lastline = text
f.close()
for name, cf in objects:
warn, fail = print_warnings(cf.after(), name in xfail)
if fail > 0: