Reformat python files checked by pylint (part 1/2).
After recently changing .pylintrc (see [1]) we discovered that the presubmit check always checks all the python files when just one python file gets updated. This CL moves all these files one step closer to what the linter wants. Autogenerated with: # Added all the files under pylint control to ~/Desktop/to-reformat cat ~/Desktop/to-reformat | xargs sed -i '1i\\' git cl format --python --full This is part 1 out of 2. The second part will fix function names and will not be automated. [1] - https://webrtc-review.googlesource.com/c/src/+/186664 No-Presubmit: True Bug: webrtc:12114 Change-Id: Idfec4d759f209a2090440d0af2413a1ddc01b841 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190980 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32530}
This commit is contained in:
committed by
Commit Bot
parent
d3a3e9ef36
commit
8cc6695652
@ -6,7 +6,6 @@
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
"""
|
||||
This scripts tests creating an Android Studio project using the
|
||||
generate_gradle.py script and making a debug build using it.
|
||||
@ -23,58 +22,59 @@ import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
SRC_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir))
|
||||
GENERATE_GRADLE_SCRIPT = os.path.join(SRC_DIR,
|
||||
'build/android/gradle/generate_gradle.py')
|
||||
GENERATE_GRADLE_SCRIPT = os.path.join(
|
||||
SRC_DIR, 'build/android/gradle/generate_gradle.py')
|
||||
GRADLEW_BIN = os.path.join(SCRIPT_DIR, 'third_party/gradle/gradlew')
|
||||
|
||||
|
||||
def _RunCommand(argv, cwd=SRC_DIR, **kwargs):
|
||||
logging.info('Running %r', argv)
|
||||
subprocess.check_call(argv, cwd=cwd, **kwargs)
|
||||
logging.info('Running %r', argv)
|
||||
subprocess.check_call(argv, cwd=cwd, **kwargs)
|
||||
|
||||
|
||||
def _ParseArgs():
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Test generating Android gradle project.')
|
||||
parser.add_argument('build_dir_android',
|
||||
help='The path to the build directory for Android.')
|
||||
parser.add_argument('--project_dir',
|
||||
help='A temporary directory to put the output.')
|
||||
parser = argparse.ArgumentParser(
|
||||
description='Test generating Android gradle project.')
|
||||
parser.add_argument('build_dir_android',
|
||||
help='The path to the build directory for Android.')
|
||||
parser.add_argument('--project_dir',
|
||||
help='A temporary directory to put the output.')
|
||||
|
||||
args = parser.parse_args()
|
||||
return args
|
||||
args = parser.parse_args()
|
||||
return args
|
||||
|
||||
|
||||
def main():
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
args = _ParseArgs()
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
args = _ParseArgs()
|
||||
|
||||
project_dir = args.project_dir
|
||||
if not project_dir:
|
||||
project_dir = tempfile.mkdtemp()
|
||||
project_dir = args.project_dir
|
||||
if not project_dir:
|
||||
project_dir = tempfile.mkdtemp()
|
||||
|
||||
output_dir = os.path.abspath(args.build_dir_android)
|
||||
project_dir = os.path.abspath(project_dir)
|
||||
output_dir = os.path.abspath(args.build_dir_android)
|
||||
project_dir = os.path.abspath(project_dir)
|
||||
|
||||
try:
|
||||
env = os.environ.copy()
|
||||
env['PATH'] = os.pathsep.join([
|
||||
os.path.join(SRC_DIR, 'third_party', 'depot_tools'), env.get('PATH', '')
|
||||
])
|
||||
_RunCommand([GENERATE_GRADLE_SCRIPT, '--output-directory', output_dir,
|
||||
'--target', '//examples:AppRTCMobile',
|
||||
'--project-dir', project_dir,
|
||||
'--use-gradle-process-resources', '--split-projects'],
|
||||
env=env)
|
||||
_RunCommand([GRADLEW_BIN, 'assembleDebug'], project_dir)
|
||||
finally:
|
||||
# Do not delete temporary directory if user specified it manually.
|
||||
if not args.project_dir:
|
||||
shutil.rmtree(project_dir, True)
|
||||
try:
|
||||
env = os.environ.copy()
|
||||
env['PATH'] = os.pathsep.join([
|
||||
os.path.join(SRC_DIR, 'third_party', 'depot_tools'),
|
||||
env.get('PATH', '')
|
||||
])
|
||||
_RunCommand([
|
||||
GENERATE_GRADLE_SCRIPT, '--output-directory', output_dir,
|
||||
'--target', '//examples:AppRTCMobile', '--project-dir',
|
||||
project_dir, '--use-gradle-process-resources', '--split-projects'
|
||||
],
|
||||
env=env)
|
||||
_RunCommand([GRADLEW_BIN, 'assembleDebug'], project_dir)
|
||||
finally:
|
||||
# Do not delete temporary directory if user specified it manually.
|
||||
if not args.project_dir:
|
||||
shutil.rmtree(project_dir, True)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
sys.exit(main())
|
||||
|
||||
Reference in New Issue
Block a user