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 37C0C13888F for ; Wed, 28 Oct 2015 16:50:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD88121C050; Wed, 28 Oct 2015 16:50:47 +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 4882F21C050 for ; Wed, 28 Oct 2015 16:50:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68993340AA7 for ; Wed, 28 Oct 2015 16:50:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D7991926 for ; Wed, 28 Oct 2015 16:50:41 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1446050996.b3cfe6e0c7754a9e17b681581b2a317b7861b486.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: /, doc/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: .pylintrc catalyst/log.py doc/make_subarch_table_guidexml.py X-VCS-Directories: / catalyst/ doc/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: b3cfe6e0c7754a9e17b681581b2a317b7861b486 X-VCS-Branch: master Date: Wed, 28 Oct 2015 16:50:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bcb61e5d-c01d-4630-8110-acbd41df0536 X-Archives-Hash: 80a85a73281470a1d4bd0cb1e4ee993b commit: b3cfe6e0c7754a9e17b681581b2a317b7861b486 Author: Mike Frysinger gentoo org> AuthorDate: Mon Oct 12 03:59:28 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Oct 28 16:49:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b3cfe6e0 lint: fix redefined-outer-name warnings 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:])