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.
|
||||
|
||||
"""Builds the AppRTC collider using the golang toolchain.
|
||||
|
||||
The golang toolchain is downloaded by download_apprtc.py. We use that here
|
||||
@ -24,44 +23,44 @@ import sys
|
||||
|
||||
import utils
|
||||
|
||||
|
||||
USAGE_STR = "Usage: {} <apprtc_dir> <go_dir> <output_dir>"
|
||||
|
||||
|
||||
def _ConfigureApprtcServerToDeveloperMode(app_yaml_path):
|
||||
for line in fileinput.input(app_yaml_path, inplace=True):
|
||||
# We can't click past these in browser-based tests, so disable them.
|
||||
line = line.replace('BYPASS_JOIN_CONFIRMATION: false',
|
||||
'BYPASS_JOIN_CONFIRMATION: true')
|
||||
sys.stdout.write(line)
|
||||
for line in fileinput.input(app_yaml_path, inplace=True):
|
||||
# We can't click past these in browser-based tests, so disable them.
|
||||
line = line.replace('BYPASS_JOIN_CONFIRMATION: false',
|
||||
'BYPASS_JOIN_CONFIRMATION: true')
|
||||
sys.stdout.write(line)
|
||||
|
||||
|
||||
def main(argv):
|
||||
if len(argv) != 4:
|
||||
return USAGE_STR.format(argv[0])
|
||||
if len(argv) != 4:
|
||||
return USAGE_STR.format(argv[0])
|
||||
|
||||
apprtc_dir = os.path.abspath(argv[1])
|
||||
go_root_dir = os.path.abspath(argv[2])
|
||||
golang_workspace = os.path.abspath(argv[3])
|
||||
apprtc_dir = os.path.abspath(argv[1])
|
||||
go_root_dir = os.path.abspath(argv[2])
|
||||
golang_workspace = os.path.abspath(argv[3])
|
||||
|
||||
app_yaml_path = os.path.join(apprtc_dir, 'out', 'app_engine', 'app.yaml')
|
||||
_ConfigureApprtcServerToDeveloperMode(app_yaml_path)
|
||||
app_yaml_path = os.path.join(apprtc_dir, 'out', 'app_engine', 'app.yaml')
|
||||
_ConfigureApprtcServerToDeveloperMode(app_yaml_path)
|
||||
|
||||
utils.RemoveDirectory(golang_workspace)
|
||||
utils.RemoveDirectory(golang_workspace)
|
||||
|
||||
collider_dir = os.path.join(apprtc_dir, 'src', 'collider')
|
||||
shutil.copytree(collider_dir, os.path.join(golang_workspace, 'src'))
|
||||
collider_dir = os.path.join(apprtc_dir, 'src', 'collider')
|
||||
shutil.copytree(collider_dir, os.path.join(golang_workspace, 'src'))
|
||||
|
||||
golang_path = os.path.join(go_root_dir, 'bin',
|
||||
'go' + utils.GetExecutableExtension())
|
||||
golang_env = os.environ.copy()
|
||||
golang_env['GOROOT'] = go_root_dir
|
||||
golang_env['GOPATH'] = golang_workspace
|
||||
collider_out = os.path.join(golang_workspace,
|
||||
'collidermain' + utils.GetExecutableExtension())
|
||||
subprocess.check_call([golang_path, 'build', '-o', collider_out,
|
||||
'collidermain'], env=golang_env)
|
||||
golang_path = os.path.join(go_root_dir, 'bin',
|
||||
'go' + utils.GetExecutableExtension())
|
||||
golang_env = os.environ.copy()
|
||||
golang_env['GOROOT'] = go_root_dir
|
||||
golang_env['GOPATH'] = golang_workspace
|
||||
collider_out = os.path.join(
|
||||
golang_workspace, 'collidermain' + utils.GetExecutableExtension())
|
||||
subprocess.check_call(
|
||||
[golang_path, 'build', '-o', collider_out, 'collidermain'],
|
||||
env=golang_env)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main(sys.argv))
|
||||
sys.exit(main(sys.argv))
|
||||
|
Reference in New Issue
Block a user