From 380d2177f59f610cc5d54d30992bc4f8e6e4f562 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 18 Mar 2014 16:03:24 -0400 Subject: [PATCH] pep8/pyflakes --- i18n/dummy.py | 4 ++-- i18n/execute.py | 3 +++ i18n/extract.py | 7 +++++-- i18n/generate.py | 4 ++++ i18n/segment.py | 6 +++++- i18n/tests/test_generate.py | 2 +- i18n/transifex.py | 2 ++ i18n/validate.py | 9 +++++++-- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/i18n/dummy.py b/i18n/dummy.py index 58506912f6..f945f1310a 100755 --- a/i18n/dummy.py +++ b/i18n/dummy.py @@ -215,8 +215,8 @@ def main(verbosity=1): if __name__ == '__main__': + # pylint: disable=invalid-name parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("--verbose", "-v", action="count", default=0) args = parser.parse_args() - ret = main(verbosity=args.verbose) - sys.exit(ret) + main(verbosity=args.verbose) diff --git a/i18n/execute.py b/i18n/execute.py index c3883569d5..86574164dd 100644 --- a/i18n/execute.py +++ b/i18n/execute.py @@ -1,3 +1,6 @@ +""" +Utility library file for executing shell commands +""" import os import subprocess import logging diff --git a/i18n/extract.py b/i18n/extract.py index dde3c66897..6d5b83f261 100755 --- a/i18n/extract.py +++ b/i18n/extract.py @@ -42,6 +42,9 @@ def base(path1, *paths): def main(verbosity=1): + """ + Main entry point of script + """ logging.basicConfig(stream=sys.stdout, level=logging.INFO) create_dir_if_necessary(LOCALE_DIR) source_msgs_dir = CONFIGURATION.source_messages_dir @@ -215,8 +218,8 @@ def is_key_string(string): if __name__ == '__main__': + # pylint: disable=invalid-name parser = argparse.ArgumentParser(description=__doc__) parser.add_argument('--verbose', '-v', action='count', default=0) args = parser.parse_args() - ret = main(verbosity=args.verbose) - sys.exit(ret) + main(verbosity=args.verbose) diff --git a/i18n/generate.py b/i18n/generate.py index 6d5de2edbf..673ca4486a 100755 --- a/i18n/generate.py +++ b/i18n/generate.py @@ -112,6 +112,9 @@ def validate_files(dir, files_to_merge): def main(strict=True, verbosity=1): + """ + Main entry point for script + """ for locale in CONFIGURATION.translated_locales: merge_files(locale, fail_if_missing=strict) # Dummy text is not required. Don't raise exception if files are missing. @@ -129,6 +132,7 @@ def main(strict=True, verbosity=1): if __name__ == '__main__': logging.basicConfig(stream=sys.stdout, level=logging.INFO) + # pylint: disable=invalid-name parser = argparse.ArgumentParser(description="Generate merged and compiled message files.") parser.add_argument("--strict", action='store_true', help="Complain about missing files.") parser.add_argument("--verbose", "-v", action="count", default=0) diff --git a/i18n/segment.py b/i18n/segment.py index ded771add0..d8466addd1 100755 --- a/i18n/segment.py +++ b/i18n/segment.py @@ -117,7 +117,10 @@ def segment_pofile(filename, segments): return files_written -def main(locales=None, verbosity=1): +def main(locales=None, verbosity=1): # pylint: disable=unused-argument + """ + Main entry point of script + """ # This is used as a tool only to segment translation files when adding a # new segment. In the regular workflow, the work is done by the extract # phase calling the functions above. @@ -129,6 +132,7 @@ def main(locales=None, verbosity=1): if __name__ == "__main__": logging.basicConfig(stream=sys.stdout, level=logging.INFO) + # pylint: disable=invalid-name description = textwrap.dedent(""" Segment the .po files in LOCALE(s) based on the segmenting rules in config.yaml. diff --git a/i18n/tests/test_generate.py b/i18n/tests/test_generate.py index f6444d416f..ba01e752c5 100644 --- a/i18n/tests/test_generate.py +++ b/i18n/tests/test_generate.py @@ -56,7 +56,7 @@ class TestGenerate(TestCase): .mo files should exist, and be recently created (modified after start of test suite) """ - generate.main(verbosity=0,strict=False) + generate.main(verbosity=0, strict=False) for locale in CONFIGURATION.translated_locales: for filename in ('django', 'djangojs'): mofile = filename+'.mo' diff --git a/i18n/transifex.py b/i18n/transifex.py index 5b718ed6ca..8997e38e61 100755 --- a/i18n/transifex.py +++ b/i18n/transifex.py @@ -64,10 +64,12 @@ def get_new_header(po): if __name__ == '__main__': + # pylint: disable=invalid-name parser = argparse.ArgumentParser() parser.add_argument("command", help="push or pull") parser.add_argument("--verbose", "-v") args = parser.parse_args() + # pylint: enable=invalid-name if args.command == "push": push() diff --git a/i18n/validate.py b/i18n/validate.py index 807fbfe8d6..7e95e36d2d 100644 --- a/i18n/validate.py +++ b/i18n/validate.py @@ -153,7 +153,7 @@ def get_parser(): """ Returns an argument parser for this script. """ - parser = argparse.ArgumentParser(description=( + parser = argparse.ArgumentParser(description=( # pylint: disable=redefined-outer-name "Automatically finds translation errors in all edx-platform *.po files, " "for all languages, unless one or more language(s) is specified to check." )) @@ -180,7 +180,10 @@ def get_parser(): return parser -def main(languages=None, empty=False, verbosity=1): +def main(languages=None, empty=False, verbosity=1): # pylint: disable=unused-argument + """ + Main entry point for script + """ languages = languages or [] if not languages: @@ -200,6 +203,7 @@ def main(languages=None, empty=False, verbosity=1): if __name__ == '__main__': + # pylint: disable=invalid-name parser = get_parser() args = parser.parse_args() if args.verbose: @@ -207,5 +211,6 @@ if __name__ == '__main__': else: log_level = logging.WARNING logging.basicConfig(stream=sys.stdout, level=log_level) + # pylint: enable=invalid-name main(languages=args.language, empty=args.empty, verbosity=args.verbose)