From patchwork Sat Apr 4 21:28:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 2134 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338335; bh=pJ2CMaFj5N83dfxhRnrP1834TjdyghVkCph3g3utCwo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=k8i0c874Vn6G5H6Q43n2k3WZ/LnZgqKpNQw+Q4/Dg+M+FC+qSMdru+eW2UYq3RB24 WYga3VWQttEuCCT8roSUaIf2keNRaUDs3oWqJPc8QyKCfz67XcxoCOIUbrxa4Nf5GN 87Oasg1ZwNUbTv28EBAJqGskTyhHHxuhFM71jhEyGXQjHBFSdcWW7NtvQJEY1K7oAy aX7hQTNslmIA+CzX3K/yyKifeOZsS9opnpRBHxqsGrbE99wTw2Tvbtnde3COqTs3TJ 44pHWJvYIhbpulNXUz5kd8B3Cz3EooghajKjkUBbmlsfzDoj++AOUNrTZ/180b05YQ 51J1GQv8P8S+g== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 675365E7B4 for ; Sat, 4 Apr 2026 15:32:15 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id v_fndTQjv15P for ; Sat, 4 Apr 2026 15:32:15 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338335; bh=pJ2CMaFj5N83dfxhRnrP1834TjdyghVkCph3g3utCwo=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=k8i0c874Vn6G5H6Q43n2k3WZ/LnZgqKpNQw+Q4/Dg+M+FC+qSMdru+eW2UYq3RB24 WYga3VWQttEuCCT8roSUaIf2keNRaUDs3oWqJPc8QyKCfz67XcxoCOIUbrxa4Nf5GN 87Oasg1ZwNUbTv28EBAJqGskTyhHHxuhFM71jhEyGXQjHBFSdcWW7NtvQJEY1K7oAy aX7hQTNslmIA+CzX3K/yyKifeOZsS9opnpRBHxqsGrbE99wTw2Tvbtnde3COqTs3TJ 44pHWJvYIhbpulNXUz5kd8B3Cz3EooghajKjkUBbmlsfzDoj++AOUNrTZ/180b05YQ 51J1GQv8P8S+g== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 4F96C5FC8F for ; Sat, 4 Apr 2026 15:32:15 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338334; bh=wBCwqxssqXjTo1GhE1UZAhvvczHYs0pvvAS9hBhmKyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CqLHibtghRd2i5HoLIXP3UxMajUivCu4izM0qC9Cy9OLVxejyhwYd0mStPgBrQxcs QvALZR1tDmH9+IBoAV5DvUhvgKt8hwJij3V8PhIsQwnWVNy6eYaDrWuLvGvHrgzcWh 3kumtVBcI/1m5YbJRrEJUV8usu+Kslv/T3XxturxCunk30kf77Y0l1NMJ9erUmNSvx RIqNTWbCtPGpyqxpmfq/nWJ2DPd4R+qO54dqLUty117ReQHLe8N5Egy6VMoQw5pjbM O0peDi+PKBiMybxUNroU5Apw6TN3jtpUCLnkGiIvYukp+vWZZ2d0aufgQ6QVR5jzcr KeL1Vg7EgbASA== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 3E98D5FC8F; Sat, 4 Apr 2026 15:32:14 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 1h29St047wso; Sat, 4 Apr 2026 15:32:14 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1775338330; bh=/7x814i92P3LJIC1PPPZapJYivgNWIPmUHdLXD3n7eM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eiWIQvAcPTr16Ey5NULbZLETg4+1qx3skHOrOjlMxRauuJsqWdaFmEXIsanDefyNL Iz5EwymYC0ycESpGF0dEhJbO65ljM5ASo3pJqwPhAs5b+l1uNF8bVksT/Mpbr4Y3ZK IOmdrrzxk6TWNsEe/I+hR0KrMrNX06h7dzQKmO6rJ3G8P2OKgYXPXcDcZPokVScBAp /uxIssIEqXRKu+zd9Md3SzwOyuacFxDrpm967y3iHYFaWgLZgmPKEP4bD1IOJ30LtZ IOkQ9aqgK1VHpuO3s+Fqj0LIl98qUJPVYXl1BoVukibinNEZb9uNTnwqT6B+8dlaD4 GSGth4YSa609A== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 220915E7B4; Sat, 4 Apr 2026 15:32:10 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Sat, 4 Apr 2026 15:28:55 -0600 Message-ID: <20260404213020.372253-20-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260404213020.372253-1-sjg@u-boot.org> References: <20260404213020.372253-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: IHG22EYVEDLUP2KP3ZDKTVXY25BLXUNT X-Message-ID-Hash: IHG22EYVEDLUP2KP3ZDKTVXY25BLXUNT X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 19/37] patman: Fix pylint warnings in control.py List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Move local imports to the top level, group patman imports together, convert a %-format string to f-string, fix a bare 'print' statement that has no effect, and suppress unavoidable warnings for functions with many branches/arguments. Signed-off-by: Simon Glass --- tools/patman/control.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/tools/patman/control.py b/tools/patman/control.py index f1e52d7944a..87598622eb7 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -17,14 +17,17 @@ except ImportError: # for Python 3.6 import importlib_resources as resources +from patman import cseries +from patman import patchstream +from patman import send +from patman import settings +from patman import status +from patman import workflow +from patman.patchwork import Patchwork from u_boot_pylib import gitutil from u_boot_pylib import terminal from u_boot_pylib import tools from u_boot_pylib import tout -from patman import patchstream -from patman.patchwork import Patchwork -from patman import send -from patman import settings def setup(): @@ -45,6 +48,7 @@ def do_send(args): send.send(args) +# pylint: disable=R0913 def patchwork_status(branch, count, start, end, dest_branch, force, show_comments, url, single_thread=False): """Check the status of patches in patchwork @@ -81,11 +85,11 @@ def patchwork_status(branch, count, start, end, dest_branch, force, warnings = 0 for cmt in series.commits: if cmt.warn: - print('%d warnings for %s:' % (len(cmt.warn), cmt.hash)) + print(f'{len(cmt.warn)} warnings for {cmt.hash}:') for warn in cmt.warn: print('\t', warn) warnings += 1 - print + print() if warnings: raise ValueError('Please fix warnings before running status') links = series.get('links') @@ -103,9 +107,6 @@ def patchwork_status(branch, count, start, end, dest_branch, force, url = series.patchwork_url pwork = Patchwork(url, single_thread=single_thread) - # Import this here to avoid failing on other commands if the dependencies - # are not present - from patman import status pwork = Patchwork(url) status.check_and_show_status(series, link, branch, dest_branch, force, show_comments, False, pwork) @@ -159,6 +160,7 @@ def _setup_patchwork(cser, pwork, ups, pw_url): return pwork +# pylint: disable=R0912,R0915 def do_series(args, test_db=None, pwork=None, cser=None): """Process a series subcommand @@ -170,8 +172,6 @@ def do_series(args, test_db=None, pwork=None, cser=None): needed cser (Cseries): Cseries object to use, None to create one """ - from patman import cseries - if not cser: cser = cseries.Cseries(test_db) needs_patchwork = [ @@ -266,6 +266,7 @@ def do_series(args, test_db=None, pwork=None, cser=None): cser.close_database() +# pylint: disable=R0912 def upstream(args, test_db=None): """Process an 'upstream' subcommand @@ -274,8 +275,6 @@ def upstream(args, test_db=None): test_db (str or None): Directory containing the test database, None to use the normal one """ - from patman import cseries - cser = cseries.Cseries(test_db) try: cser.open_database() @@ -324,6 +323,7 @@ def upstream(args, test_db=None): cser.close_database() +# pylint: disable=R0912 def patchwork(args, test_db=None, pwork=None): """Process a 'patchwork' subcommand Args: @@ -332,8 +332,6 @@ def patchwork(args, test_db=None, pwork=None): use the normal one pwork (Patchwork): Patchwork object to use """ - from patman import cseries - cser = cseries.Cseries(test_db) try: cser.open_database() @@ -387,9 +385,6 @@ def do_workflow(args, test_db=None): test_db (str or None): Directory containing the test database, None to use the normal one """ - from patman import cseries - from patman import workflow - cser = cseries.Cseries(test_db) try: cser.open_database() @@ -408,6 +403,7 @@ def do_workflow(args, test_db=None): cser.close_database() +# pylint: disable=R0912 def do_patman(args, test_db=None, pwork=None, cser=None): """Process a patman command @@ -458,7 +454,7 @@ def do_patman(args, test_db=None, pwork=None, cser=None): patchwork(args, test_db, pwork) elif args.cmd == 'workflow': do_workflow(args, test_db) - except Exception as exc: + except Exception as exc: # pylint: disable=W0718 terminal.tprint(f'patman: {type(exc).__name__}: {exc}', colour=terminal.Color.RED) if args.debug: