godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues 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>
This commit is contained in:
Vincent Fazio
2023-04-02 20:35:30 -05:00
committed by Yann E. MORIN
parent 370af35425
commit b7d4ae98fa
1 changed files with 3 additions and 7 deletions
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 magic
import os import os
import re import re
import six
import sys import sys
import checkpackagelib.base import checkpackagelib.base
@@ -228,12 +227,9 @@ def check_file_using_lib(fname):
if fail > 0: if fail > 0:
failed.add(name) failed.add(name)
nwarnings += warn nwarnings += warn
if six.PY3:
f = open(fname, "r", errors="surrogateescape")
else:
f = open(fname, "r")
lastline = "" lastline = ""
for lineno, text in enumerate(f.readlines()): for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()):
nlines += 1 nlines += 1
for name, cf in objects: for name, cf in objects:
if cf.disable.search(lastline): if cf.disable.search(lastline):
@@ -243,7 +239,7 @@ def check_file_using_lib(fname):
failed.add(name) failed.add(name)
nwarnings += warn nwarnings += warn
lastline = text lastline = text
f.close()
for name, cf in objects: for name, cf in objects:
warn, fail = print_warnings(cf.after(), name in xfail) warn, fail = print_warnings(cf.after(), name in xfail)
if fail > 0: if fail > 0: