From patchwork Wed Jul 10 01:24:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 11037691 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A552514DB for ; Wed, 10 Jul 2019 01:34:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98550288E5 for ; Wed, 10 Jul 2019 01:34:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BD0328900; Wed, 10 Jul 2019 01:34:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 292D2288E5 for ; Wed, 10 Jul 2019 01:34:46 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 15D2A40BB; Wed, 10 Jul 2019 01:34:42 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 733D13645 for ; Wed, 10 Jul 2019 01:25:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mo-csw.securemx.jp (mo-csw1116.securemx.jp [210.130.202.158]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 21053886 for ; Wed, 10 Jul 2019 01:25:06 +0000 (UTC) Received: by mo-csw.securemx.jp (mx-mo-csw1116) id x6A1Owce014452; Wed, 10 Jul 2019 10:24:58 +0900 X-Iguazu-Qid: 2wGr1P8H2t2RwrLHdY X-Iguazu-QSIG: v=2; s=0; t=1562721898; q=2wGr1P8H2t2RwrLHdY; m=wHO8XbjNMaiBCXLgtopy9TFhduQkO6Z3B+ECrHDkbcE= Received: from imx2.toshiba.co.jp (imx2.toshiba.co.jp [106.186.93.51]) by relay.securemx.jp (mx-mr1110) id x6A1Oviw026378; Wed, 10 Jul 2019 10:24:57 +0900 Received: from enc01.localdomain ([106.186.93.100]) by imx2.toshiba.co.jp with ESMTP id x6A1OvmL019834; Wed, 10 Jul 2019 10:24:57 +0900 (JST) Received: from hop001.toshiba.co.jp ([133.199.164.63]) by enc01.localdomain with ESMTP id x6A1OvG4025497; Wed, 10 Jul 2019 10:24:57 +0900 From: Daniel Sangorrin To: ben.hutchings@codethink.co.uk Date: Wed, 10 Jul 2019 10:24:49 +0900 X-TSB-HOP: ON Message-Id: <20190710012450.16524-6-daniel.sangorrin@toshiba.co.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190710012450.16524-1-daniel.sangorrin@toshiba.co.jp> References: <20190710012450.16524-1-daniel.sangorrin@toshiba.co.jp> Cc: cip-dev@lists.cip-project.org Subject: [cip-dev] [cip-kernel-sec][RESEND 5/6] pep8: fix pep8-related errors such as too long lines X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org X-Virus-Scanned: ClamAV using ClamSMTP These were distracting when checking new code. Signed-off-by: Daniel Sangorrin --- scripts/import_stable.py | 8 +++++--- scripts/kernel_sec/branch.py | 4 ++-- scripts/prepare_remotes.py | 2 +- scripts/report_affected.py | 2 +- scripts/webview.py | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/import_stable.py b/scripts/import_stable.py index 194219d..b4d8e0a 100755 --- a/scripts/import_stable.py +++ b/scripts/import_stable.py @@ -64,7 +64,8 @@ def get_backports(git_repo, remotes, branches, debug=False): backports.setdefault(mainline_commit, {})[branch_name] \ = stable_commit if line.strip() != '': - commit_re = BACKPORT_COMMIT_BOTTOM_RE # next line is not top + # next line is not top + commit_re = BACKPORT_COMMIT_BOTTOM_RE return backports @@ -120,7 +121,8 @@ def add_backports(branches, c_b_map, issue_commits, all_backports, if debug_context: print('%s/%s: recording commits' % (debug_context, branch_name)) - issue_commits.setdefault(branch_name, []).extend(branch_commits) + issue_commits.setdefault( + branch_name, []).extend(branch_commits) changed = True else: if debug_context: @@ -169,7 +171,7 @@ if __name__ == '__main__': metavar='DIRECTORY') parser.add_argument('--remote-name', dest='remote_name', action='append', default=[], - help='git remote name mappings, e.g. stable:korg-stable', + help='git remote name mappings, e.g. stable:mystable', metavar='NAME:OTHER-NAME') parser.add_argument('--mainline-remote', dest='mainline_remote_name', diff --git a/scripts/kernel_sec/branch.py b/scripts/kernel_sec/branch.py index 96f1cab..52f3b42 100644 --- a/scripts/kernel_sec/branch.py +++ b/scripts/kernel_sec/branch.py @@ -62,8 +62,8 @@ def _extract_live_stable_branches(doc): if match: version = match.group(1) eol = match.group(2) is not None - if branch_type not in ['mainline', 'stable', 'longterm', 'linux-next'] \ - or version is None: + if branch_type not in ['mainline', 'stable', 'longterm', + 'linux-next'] or version is None: raise ValueError('failed to parse releases row text %r' % row_text) # Filter out irrelevant branches diff --git a/scripts/prepare_remotes.py b/scripts/prepare_remotes.py index 59310fc..ab0db24 100755 --- a/scripts/prepare_remotes.py +++ b/scripts/prepare_remotes.py @@ -45,7 +45,7 @@ if __name__ == '__main__': metavar='DIRECTORY') parser.add_argument('--remote-name', dest='remote_name', action='append', default=[], - help='git remote name mappings, e.g. stable:korg-stable', + help='git remote name mappings, e.g. stable:mystable', metavar='NAME:OTHER-NAME') parser.add_argument('--mainline-remote', dest='mainline_remote_name', diff --git a/scripts/report_affected.py b/scripts/report_affected.py index 7ec4af7..a97986c 100755 --- a/scripts/report_affected.py +++ b/scripts/report_affected.py @@ -143,7 +143,7 @@ if __name__ == '__main__': metavar='DIRECTORY') parser.add_argument('--remote-name', dest='remote_name', action='append', default=[], - help='git remote name mappings, e.g. stable:korg-stable', + help='git remote name mappings, e.g. stable:mystable', metavar='NAME:OTHER-NAME') parser.add_argument('--mainline-remote', dest='mainline_remote_name', diff --git a/scripts/webview.py b/scripts/webview.py index 52a7b15..cf54948 100755 --- a/scripts/webview.py +++ b/scripts/webview.py @@ -205,7 +205,7 @@ if __name__ == '__main__': metavar='DIRECTORY') parser.add_argument('--remote-name', dest='remote_name', action='append', default=[], - help='git remote name mappings, e.g. stable:korg-stable', + help='git remote name mappings, e.g. stable:mystable', metavar='NAME:OTHER-NAME') parser.add_argument('--mainline-remote', dest='mainline_remote_name',