use None and args

oppia · brianrodri · Sep 8, 2019 · Aug 17, 2019 · Aug 18, 2019 · Aug 18, 2019
commit 64fc6c504de65e671490e84f2cbc47cc6adc5e42
@@ -26,7 +26,6 @@
 import re
 import shutil
 import subprocess
-import sys
 import threading
 
 import python_utils
@@ -1359,14 +1358,14 @@ def compile_typescript_files_continuously(project_dir):
                     return
 
 
-def main(argv=None):
+def main(args=None):
     """The main method of this script.
 
     Creates a third-party directory where all the JS and CSS dependencies are
     built and stored. Depending on the options passed to the script, might also
     minify third-party libraries and/or generate a build directory.
     """
-    options = _PARSER.parse_args(args=argv)
+    options = _PARSER.parse_args(args=args)
     # Regenerate /third_party/generated from scratch.
     safe_delete_directory_tree(THIRD_PARTY_GENERATED_DEV_DIR)
     build_third_party_libs(THIRD_PARTY_GENERATED_DEV_DIR)
@@ -1395,4 +1394,4 @@ def main(argv=None):
 # The 'no coverage' pragma is used as this line is un-testable. This is because
 # it will only be called when build.py is used as a script.
 if __name__ == '__main__':  # pragma: no cover
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -21,7 +21,6 @@
 import os
 import shutil
 import subprocess
-import sys
 
 # These libraries need to be installed before running or importing any script.
 TOOLS_DIR = os.path.join('..', 'oppia_tools')
@@ -107,7 +106,7 @@ def pip_install(package, version, install_path):
         install_path])
 
 
-def install_skulpt(argv):
+def install_skulpt(args):
     """Download and install Skulpt. Skulpt is built using a Python script
     included within the Skulpt repository (skulpt.py). This script normally
     requires GitPython, however the patches to it below
@@ -117,7 +116,7 @@ def install_skulpt(argv):
     warning saying its dist command will not work properly without GitPython,
     but it does actually work due to the patches.
     """
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     no_skulpt = parsed_args.nojsrepl or parsed_args.noskulpt
 
     python_utils.PRINT('Checking whether Skulpt is installed in third_party')
@@ -196,16 +195,16 @@ def maybe_install_dependencies(
     """Parse additional command line arguments."""
     if skip_installing_third_party_libs is False:
         # Install third party dependencies.
-        main(argv=[])
+        main(args=[])
         # Ensure that generated JS and CSS files are in place before running the
         # tests.
         python_utils.PRINT('Running build task with concatenation only')
-        build.main(argv=[])
+        build.main(args=[])
 
     if run_minified_tests is True:
         python_utils.PRINT(
             'Running build task with concatenation and minification')
-        build.main(argv=['--prod_env'])
+        build.main(args=['--prod_env'])
 
 
 def ensure_pip_library_is_installed(package, version, path):
@@ -225,7 +224,7 @@ def ensure_pip_library_is_installed(package, version, path):
         pip_install(package, version, exact_lib_path)
 
 
-def main(argv=None):
+def main(args=None):
     """Install third-party libraries for Oppia."""
     setup.main()
     setup_gae.main()
@@ -256,16 +255,16 @@ def main(argv=None):
     # 374076889.
     subprocess.call([common.NPM_PATH, 'dedupe'])
 
-    install_skulpt(argv)
+    install_skulpt(args)
 
     # Install pre-commit script.
     python_utils.PRINT('Installing pre-commit hook for git')
-    pre_commit_hook.main(argv=['--install'])
+    pre_commit_hook.main(args=['--install'])
 
     # Install pre-push script.
     python_utils.PRINT('Installing pre-push hook for git')
-    pre_push_hook.main(argv=['--install'])
+    pre_push_hook.main(args=['--install'])
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -126,14 +126,14 @@ def _revert_changes_in_package_lock_file():
         raise ValueError(err_unstage_cmd)
 
 
-def main(argv=None):
+def main(args=None):
     """Main method for pre-commit hook that checks files added/modified
     in a commit.
     """
     parser = argparse.ArgumentParser()
     parser.add_argument('--install', action='store_true', default=False,
                         help='Install pre_commit_hook to the .git/hooks dir')
-    args = parser.parse_args(args=argv)
+    args = parser.parse_args(args=args)
     if args.install:
         _install_hook()
         return
@@ -150,4 +150,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -3147,11 +3147,11 @@ def _print_complete_summary_of_errors():
         python_utils.PRINT(error_messages)
 
 
-def main(argv=None):
+def main(args=None):
     """Main method for pre commit linter script that lints Python, JavaScript,
     HTML, and CSS files.
     """
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     # Default mode is non-verbose mode, if arguments contains --verbose flag it
     # will be made True, which will represent verbose mode.
     verbose_mode_enabled = bool(parsed_args.verbose)
@@ -3198,4 +3198,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -356,7 +356,7 @@ def _does_diff_include_package_json(files_to_lint):
     return False
 
 
-def main(argv=None):
+def main(args=None):
     """Main method for pre-push hook that executes the Python/JS linters on all
     files that deviate from develop.
     """
@@ -365,7 +365,7 @@ def main(argv=None):
     parser.add_argument('url', nargs='?', help='provided by git before push')
     parser.add_argument('--install', action='store_true', default=False,
                         help='Install pre_push_hook to the .git/hooks dir')
-    args = parser.parse_args(args=argv)
+    args = parser.parse_args(args=args)
     if args.install:
         _install_hook()
         return
@@ -408,4 +408,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -24,18 +24,22 @@
 import re
 import sys
 
+import python_utils
+from . import docstrings_checker
+
 _PARENT_DIR = os.path.abspath(os.path.join(os.getcwd(), os.pardir))
 _PYLINT_PATH = os.path.join(_PARENT_DIR, 'oppia_tools', 'pylint-1.9.4')
 sys.path.insert(0, _PYLINT_PATH)
 
-import astroid
-from pylint import checkers
-from pylint import interfaces
-from pylint.checkers import typecheck
-from pylint.checkers import utils as checker_utils
-
-import python_utils  # isort:skip
-from . import docstrings_checker  # isort:skip
+# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-position
+import astroid  # isort:skip
+from pylint import checkers  # isort:skip
+from pylint import interfaces  # isort:skip
+from pylint.checkers import typecheck  # isort:skip
+from pylint.checkers import utils as checker_utils  # isort:skip
+# pylint: enable=wrong-import-position
+# pylint: enable=wrong-import-order
 
 
 def read_from_node(node):

@@ -308,7 +308,7 @@ def _get_test_target_classes(path):
     return result
 
 
-def main(argv=None):
+def main(args=None):
     """Run the tests."""
     setup.main()
     setup_gae.main()
@@ -321,7 +321,7 @@ def main(argv=None):
     import dev_appserver
     dev_appserver.fix_sys_path()
 
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     if parsed_args.generate_coverage_report:
         python_utils.PRINT(
             'Checking whether coverage is installed in %s'
@@ -333,7 +333,7 @@ def main(argv=None):
                 'coverage', '4.5.4',
                 os.path.join(common.OPPIA_TOOLS_DIR, 'coverage-4.5.4'))
 
-    build.main(argv=[])
+    build.main(args=[])
 
     # Compile typescript files.
     python_utils.PRINT('Compiling typescript...')
@@ -499,4 +499,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
diff --git a/scripts/run_e2e_tests.py b/scripts/run_e2e_tests.py
@@ -23,7 +23,6 @@
 import re
 import shutil
 import subprocess
-import sys
 import time
 
 import python_utils
@@ -102,14 +101,14 @@ def cleanup():
     python_utils.PRINT('Done!')
 
 
-def main(argv=None):
+def main(args=None):
     """Runs the end to end tests."""
     setup.main()
     setup_gae.main()
     if os.environ.get('TRAVIS'):
         install_chrome_on_travis.main()
 
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     install_third_party_libs.maybe_install_dependencies(
         parsed_args.skip_install, parsed_args.run_minified_tests)
 
@@ -145,7 +144,7 @@ def main(argv=None):
             python_utils.PRINT(
                 re.sub(r'\'DEV_MODE\': .*', constants_env_variable, line),
                 end='')
-        build.main(argv=['--prod_env'])
+        build.main(args=['--prod_env'])
         app_yaml_filepath = 'app.yaml'
     else:
         dev_mode = 'true'
@@ -157,7 +156,7 @@ def main(argv=None):
             python_utils.PRINT(
                 re.sub(r'\'DEV_MODE\': .*', constants_env_variable, line),
                 end='')
-        build.main(argv=[])
+        build.main(args=[])
         app_yaml_filepath = 'app_dev.yaml'
 
     # Start a selenium server using chromedriver 2.41.
@@ -249,4 +248,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -19,7 +19,6 @@
 import argparse
 import os
 import subprocess
-import sys
 
 import python_utils
 
@@ -50,12 +49,12 @@
     action='store_true')
 
 
-def main(argv=None):
+def main(args=None):
     """Runs the frontend tests."""
     setup.main()
     setup_gae.main()
 
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     install_third_party_libs.maybe_install_dependencies(
         parsed_args.skip_install, parsed_args.run_minified_tests)
     common.print_each_string_after_two_new_lines([
@@ -64,7 +63,7 @@ def main(argv=None):
         'on your filesystem.',
         'Running test in development environment'])
 
-    build.main(argv=[])
+    build.main(args=[])
 
     subprocess.call([
         os.path.join(common.NODE_MODULES_PATH, 'karma', 'bin', 'karma'),
@@ -73,7 +72,7 @@ def main(argv=None):
     if parsed_args.run_minified_tests is True:
         python_utils.PRINT('Running test in production environment')
 
-        build.main(argv=['--prod_env', '--minify_third_party_libs_only'])
+        build.main(args=['--prod_env', '--minify_third_party_libs_only'])
 
         subprocess.call([
             os.path.join(common.NODE_MODULES_PATH, 'karma', 'bin', 'karma'),
@@ -84,4 +83,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)
@@ -20,7 +20,6 @@
 import atexit
 import os
 import subprocess
-import sys
 import time
 
 import python_utils
@@ -90,12 +89,12 @@ def run_performance_test(test_name, xvfb_prefix):
             '--test_target=core.tests.performance_tests.%s' % test_name])
 
 
-def main(argv=None):
+def main(args=None):
     """Main function to run the performance tests."""
     setup.main()
     setup_gae.main()
 
-    parsed_args = _PARSER.parse_args(args=argv)
+    parsed_args = _PARSER.parse_args(args=args)
     install_third_party_libs.maybe_install_dependencies(
         parsed_args.skip_install, parsed_args.run_minified_tests)
 
@@ -165,4 +164,4 @@ def main(argv=None):
 
 
 if __name__ == '__main__':
-    main(argv=sys.argv[1:])
+    main(args=None)