From: Vincent Fazio <vfazio@gmail.com>
To: buildroot@buildroot.org
Cc: Vincent Fazio <vfazio@gmail.com>,
Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
Subject: [Buildroot] [PATCH] utils/check-package: drop six usage
Date: Sun, 2 Apr 2023 20:35:30 -0500 [thread overview]
Message-ID: <20230403013530.3502-1-vfazio@gmail.com> (raw)
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>
---
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:
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2023-04-03 1:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 1:35 Vincent Fazio [this message]
2023-04-07 17:10 ` [Buildroot] [PATCH] utils/check-package: drop six usage James Knight
2023-04-10 17:44 ` Yann E. MORIN
2023-04-10 19:11 ` Arnout Vandecappelle
2023-04-10 19:04 ` Yann E. MORIN
2023-04-22 21:10 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230403013530.3502-1-vfazio@gmail.com \
--to=vfazio@gmail.com \
--cc=buildroot@buildroot.org \
--cc=ricardo.martincoski@datacom.com.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.