zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inclusive language in PRESUBMIT.py.

Browse Source 
TBR=tommi@webrtc.org

Bug: webrtc:11680
Change-Id: I8db5e3fdd087f9b4bb5b3e1baffbab6456f7ced8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179960
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31779}
This commit is contained in:
Mirko Bonadei
2020-07-22 10:33:44 +02:00
committed by Commit Bot
parent 7d0cde5117
commit 6c1278acd6
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PRESUBMIT.py
View File

@ -176,7 +176,7 @@ def CheckNativeApiHeaderChanges(input_api, output_api):
"""Checks to remind proper changing of native APIs.""" """Checks to remind proper changing of native APIs."""
files = [] files = []
source_file_filter = lambda x: input_api.FilterSourceFile( source_file_filter = lambda x: input_api.FilterSourceFile(
x, allow_list=[r'.+\.(gn|gni|h)$']) x, files_to_check=[r'.+\.(gn|gni|h)$'])
for f in input_api.AffectedSourceFiles(source_file_filter): for f in input_api.AffectedSourceFiles(source_file_filter):
for path in API_DIRS: for path in API_DIRS:
dn = os.path.dirname(f.LocalPath()) dn = os.path.dirname(f.LocalPath())
@ -605,8 +605,8 @@ def CheckCheckIncludesIsNotUsed(gn_files, input_api, output_api):
def CheckGnChanges(input_api, output_api): def CheckGnChanges(input_api, output_api):
file_filter = lambda x: (input_api.FilterSourceFile( file_filter = lambda x: (input_api.FilterSourceFile(
x, allow_list=(r'.+\.(gn|gni)$',), x, files_to_check=(r'.+\.(gn|gni)$',),
block_list=(r'.*/presubmit_checks_lib/testdata/.*',))) files_to_skip=(r'.*/presubmit_checks_lib/testdata/.*',)))
gn_files = [] gn_files = []
for f in input_api.AffectedSourceFiles(file_filter): for f in input_api.AffectedSourceFiles(file_filter):
@ -850,7 +850,7 @@ def CommonChecks(input_api, output_api):
results = [] results = []
# Filter out files that are in objc or ios dirs from being cpplint-ed since # Filter out files that are in objc or ios dirs from being cpplint-ed since
# they do not follow C++ lint rules. # they do not follow C++ lint rules.
exception_list = input_api.DEFAULT_BLACK_LIST + ( exception_list = input_api.DEFAULT_FILES_TO_SKIP + (
r".*\bobjc[\\\/].*", r".*\bobjc[\\\/].*",
r".*objc\.[hcm]+$", r".*objc\.[hcm]+$",
) )
@ -861,7 +861,7 @@ def CommonChecks(input_api, output_api):
results.extend(input_api.canned_checks.CheckLicense( results.extend(input_api.canned_checks.CheckLicense(
input_api, output_api, _LicenseHeader(input_api))) input_api, output_api, _LicenseHeader(input_api)))
results.extend(input_api.canned_checks.RunPylint(input_api, output_api, results.extend(input_api.canned_checks.RunPylint(input_api, output_api,
block_list=(r'^base[\\\/].*\.py$', files_to_skip=(r'^base[\\\/].*\.py$',
r'^build[\\\/].*\.py$', r'^build[\\\/].*\.py$',
r'^buildtools[\\\/].*\.py$', r'^buildtools[\\\/].*\.py$',
r'^infra[\\\/].*\.py$', r'^infra[\\\/].*\.py$',
@ -888,12 +888,12 @@ def CommonChecks(input_api, output_api):
# Also we will skip most checks for third_party directory. # Also we will skip most checks for third_party directory.
third_party_filter_list = (r'^third_party[\\\/].+',) third_party_filter_list = (r'^third_party[\\\/].+',)
eighty_char_sources = lambda x: input_api.FilterSourceFile(x, eighty_char_sources = lambda x: input_api.FilterSourceFile(x,
block_list=build_file_filter_list + objc_filter_list + files_to_skip=build_file_filter_list + objc_filter_list +
third_party_filter_list) third_party_filter_list)
hundred_char_sources = lambda x: input_api.FilterSourceFile(x, hundred_char_sources = lambda x: input_api.FilterSourceFile(x,
allow_list=objc_filter_list) files_to_check=objc_filter_list)
non_third_party_sources = lambda x: input_api.FilterSourceFile(x, non_third_party_sources = lambda x: input_api.FilterSourceFile(x,
block_list=third_party_filter_list) files_to_skip=third_party_filter_list)
results.extend(input_api.canned_checks.CheckLongLines( results.extend(input_api.canned_checks.CheckLongLines(
input_api, output_api, maxlen=80, source_file_filter=eighty_char_sources)) input_api, output_api, maxlen=80, source_file_filter=eighty_char_sources))
@ -1114,7 +1114,7 @@ def CheckOrphanHeaders(input_api, output_api, source_file_filter):
from check_orphan_headers import IsHeaderInBuildGn from check_orphan_headers import IsHeaderInBuildGn
file_filter = lambda x: input_api.FilterSourceFile( file_filter = lambda x: input_api.FilterSourceFile(
x, block_list=exempt_paths) and source_file_filter(x) x, files_to_skip=exempt_paths) and source_file_filter(x)
for f in input_api.AffectedSourceFiles(file_filter): for f in input_api.AffectedSourceFiles(file_filter):
if f.LocalPath().endswith('.h'): if f.LocalPath().endswith('.h'):
file_path = os.path.abspath(f.LocalPath()) file_path = os.path.abspath(f.LocalPath())
@ -1133,7 +1133,7 @@ def CheckNewlineAtTheEndOfProtoFiles(input_api, output_api, source_file_filter):
error_msg = 'File {} must end with exactly one newline.' error_msg = 'File {} must end with exactly one newline.'
results = [] results = []
file_filter = lambda x: input_api.FilterSourceFile( file_filter = lambda x: input_api.FilterSourceFile(
x, allow_list=(r'.+\.proto$',)) and source_file_filter(x) x, files_to_check=(r'.+\.proto$',)) and source_file_filter(x)
for f in input_api.AffectedSourceFiles(file_filter): for f in input_api.AffectedSourceFiles(file_filter):
file_path = f.LocalPath() file_path = f.LocalPath()
with open(file_path) as f: with open(file_path) as f:

3
presubmit_test_mocks.py
View File

@ -33,7 +33,8 @@ class MockInputApi(object):
return self.files return self.files
@classmethod @classmethod
def FilterSourceFile(cls, affected_file, white_list=(), black_list=()): def FilterSourceFile(cls, affected_file, files_to_check=(),
files_to_skip=()):
# pylint: disable=unused-argument # pylint: disable=unused-argument
return True return True