commit: b3cfe6e0c7754a9e17b681581b2a317b7861b486
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 03:59:28 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> 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:])
