From aa658bec37677fa6b7259e186a80a75231ab5b92 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sun, 2 Apr 2023 20:35:30 -0500 Subject: [PATCH] utils/check-package: drop six usage 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 Tested-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit b7d4ae98faac020e2f620fda47c2777ad1deddfa) Signed-off-by: Peter Korsgaard --- utils/check-package | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utils/check-package b/utils/check-package index 98a25bd0b2..46f2897b51 100755 --- a/utils/check-package +++ b/utils/check-package @@ -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: