From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BB45E13888F for ; Mon, 12 Oct 2015 04:36:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12FA821C013; Mon, 12 Oct 2015 04:36:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A770E086C for ; Mon, 12 Oct 2015 04:36:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 6224133FA71 for ; Mon, 12 Oct 2015 04:36:08 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 9/9] lint: fix redefined-outer-name warnings Date: Mon, 12 Oct 2015 00:36:02 -0400 Message-Id: <1444624562-26162-9-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1444624562-26162-1-git-send-email-vapier@gentoo.org> References: <1444624562-26162-1-git-send-email-vapier@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: b743c65f-5aff-46d3-9fff-1be38708044f X-Archives-Hash: a986e98f7834cadf47ae7bcd2141810a The doc module just needs a main func to hold all the variables instead of coding it all in global scope. --- .pylintrc | 3 +-- catalyst/log.py | 4 ++++ doc/make_subarch_table_guidexml.py | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.pylintrc b/.pylintrc index 2a03f23..e657daf 100644 --- a/.pylintrc +++ b/.pylintrc @@ -32,10 +32,9 @@ load-plugins= # bad-continuation -- might be hard with tab indentation policy # invalid-name -- need to manage constants better # line-too-long -- figure out a length and stick to it -# redefined-outer-name -- clean up code to not do this # super-init-not-called -- fix the classes __init__ structure # no-init -- update classes w/missing __init__ functions -disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, redefined-outer-name, super-init-not-called, no-init +disable=missing-docstring, too-many-lines, too-many-branches, too-many-statements, too-few-public-methods, too-many-instance-attributes, too-many-public-methods, too-many-locals, too-many-arguments, locally-enabled, locally-disabled, fixme, broad-except, bad-whitespace, bad-continuation, invalid-name, line-too-long, super-init-not-called, no-init [REPORTS] diff --git a/catalyst/log.py b/catalyst/log.py index 5938199..d640dec 100644 --- a/catalyst/log.py +++ b/catalyst/log.py @@ -98,6 +98,10 @@ class CatalystFormatter(logging.Formatter): return msg +# We define |debug| in global scope so people can call log.debug(), but it +# makes the linter complain when we have a |debug| keyword. Since we don't +# use that func in here, it's not a problem, so silence the warning. +# pylint: disable=redefined-outer-name def setup_logging(level, output=None, debug=False, color=None): """Initialize the logging module using the |level| level""" # The incoming level will be things like "info", but setLevel wants diff --git a/doc/make_subarch_table_guidexml.py b/doc/make_subarch_table_guidexml.py index a6a9022..0699d2a 100755 --- a/doc/make_subarch_table_guidexml.py +++ b/doc/make_subarch_table_guidexml.py @@ -6,6 +6,7 @@ import os import re +import sys import textwrap @@ -99,11 +100,11 @@ def dump(subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id): f.close() -if __name__ == '__main__': +def main(_argv): subarch_title_to_subarch_id = dict() subarch_id_to_pattern_arch_genericrch_id = dict() - for (dirpath, dirnames, filenames) in os.walk('catalyst/arch'): + for dirpath, _dirnames, filenames in os.walk('catalyst/arch'): for _fn in filenames: if not _fn.endswith('.py'): continue @@ -114,3 +115,7 @@ if __name__ == '__main__': handle_file(fn, subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id) dump(subarch_title_to_subarch_id, subarch_id_to_pattern_arch_genericrch_id) + + +if __name__ == '__main__': + main(sys.argv[1:]) -- 2.5.2