tools: remove `USE_PYTHON3 = True` from PRESUBMIT.py
presubmit now uses python3 only.
This is generated by
$ rg -l '^USE_PYTHON3 = True' | \
xargs sed -z -i "s/\n*USE_PYTHON3 = True\n*/\n\n\n/"
with some more modifications.
This also removes run_on_python2, run_on_python3, and skip_shebang_check
args.
Bug: 1207012
Change-Id: I43ac77120dc2456bc065a41750f1f5ddfd88d9e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4576841
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1152146}
diff --git a/tools/PRESUBMIT.py b/tools/PRESUBMIT.py
index d20f393..9161e843 100644
--- a/tools/PRESUBMIT.py
+++ b/tools/PRESUBMIT.py
@@ -4,10 +4,6 @@
PRESUBMIT_VERSION = '2.0.0'
-# This line is 'magic' in that git-cl looks for it to decide whether to
-# use Python3 instead of Python2 when running the code in this file.
-USE_PYTHON3 = True
-
def CheckPythonTests(input_api, output_api):
return input_api.RunTests(
@@ -15,7 +11,4 @@
input_api,
output_api,
input_api.PresubmitLocalPath(),
- files_to_check=[r'.+_(?:unit)?test\.py$'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ files_to_check=[r'.+_(?:unit)?test\.py$']))
diff --git a/tools/android/checkxmlstyle/PRESUBMIT.py b/tools/android/checkxmlstyle/PRESUBMIT.py
index f4c3aba..4a34c0b 100644
--- a/tools/android/checkxmlstyle/PRESUBMIT.py
+++ b/tools/android/checkxmlstyle/PRESUBMIT.py
@@ -9,9 +9,6 @@
"""
-USE_PYTHON3 = True
-
-
def CheckChangeOnUpload(input_api, output_api):
return _CommonChecks(input_api, output_api)
@@ -23,9 +20,6 @@
def _CommonChecks(input_api, output_api):
result = []
result.extend(
- input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- ['./checkxmlstyle_test.py'],
- run_on_python2=False,
- run_on_python3=True))
+ input_api.canned_checks.RunUnitTests(input_api, output_api,
+ ['./checkxmlstyle_test.py']))
return result
diff --git a/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py b/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
index b416af6f..3b2f173 100644
--- a/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
+++ b/tools/android/customtabs_benchmark/scripts/PRESUBMIT.py
@@ -9,9 +9,6 @@
"""
-USE_PYTHON3 = True
-
-
def CommonChecks(input_api, output_api):
output = []
# These tests don't run on Windows and give verbose and cryptic failure
diff --git a/tools/android/dependency_analysis/PRESUBMIT.py b/tools/android/dependency_analysis/PRESUBMIT.py
index afe3b479..cc4b2ce 100644
--- a/tools/android/dependency_analysis/PRESUBMIT.py
+++ b/tools/android/dependency_analysis/PRESUBMIT.py
@@ -8,19 +8,13 @@
"""
-USE_PYTHON3 = True
-
-
def CommonChecks(input_api, output_api):
checks = input_api.canned_checks.GetUnitTestsRecursively(
input_api,
output_api,
input_api.PresubmitLocalPath(),
files_to_check=[r'.+_unittest\.py$'],
- files_to_skip=[],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True)
+ files_to_skip=[])
return input_api.RunTests(checks, False)
diff --git a/tools/android/infobar_deprecation/PRESUBMIT.py b/tools/android/infobar_deprecation/PRESUBMIT.py
index 4b77833..d952a37 100644
--- a/tools/android/infobar_deprecation/PRESUBMIT.py
+++ b/tools/android/infobar_deprecation/PRESUBMIT.py
@@ -6,14 +6,10 @@
Runs Python unit tests in /tools/android/infobar_deprecation on upload.
"""
-USE_PYTHON3 = True
-
def CheckChangeOnUpload(input_api, output_api):
result = []
result.extend(
- input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- ['./infobar_deprecation_test.py'],
- run_on_python2=False))
+ input_api.canned_checks.RunUnitTests(input_api, output_api,
+ ['./infobar_deprecation_test.py']))
return result
diff --git a/tools/android/native_lib_memory/PRESUBMIT.py b/tools/android/native_lib_memory/PRESUBMIT.py
index 0d83089..d435fd2 100644
--- a/tools/android/native_lib_memory/PRESUBMIT.py
+++ b/tools/android/native_lib_memory/PRESUBMIT.py
@@ -9,9 +9,6 @@
"""
-USE_PYTHON3 = True
-
-
def CommonChecks(input_api, output_api):
output = []
files_to_skip = []
diff --git a/tools/android/python_utils/PRESUBMIT.py b/tools/android/python_utils/PRESUBMIT.py
index 9d79f84..2cf847e 100644
--- a/tools/android/python_utils/PRESUBMIT.py
+++ b/tools/android/python_utils/PRESUBMIT.py
@@ -8,7 +8,6 @@
for more details on the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
@@ -23,8 +22,6 @@
output_api,
input_api.PresubmitLocalPath(),
files_to_check=[r'.+_unittest\.py$'],
- files_to_skip=[],
- run_on_python2=False,
- run_on_python3=True)
+ files_to_skip=[])
return input_api.RunTests(checks, False)
diff --git a/tools/android/test_health/PRESUBMIT.py b/tools/android/test_health/PRESUBMIT.py
index d13448f..6bd6eb2 100644
--- a/tools/android/test_health/PRESUBMIT.py
+++ b/tools/android/test_health/PRESUBMIT.py
@@ -9,7 +9,6 @@
import pathlib
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
@@ -26,9 +25,7 @@
output_api,
input_api.PresubmitLocalPath(),
files_to_check=[r'.+_unittest\.py$'],
- files_to_skip=[],
- run_on_python2=False,
- run_on_python3=True)
+ files_to_skip=[])
return input_api.RunTests(checks, False)
diff --git a/tools/binary_size/PRESUBMIT.py b/tools/binary_size/PRESUBMIT.py
index 0064a08..7b57d4f 100644
--- a/tools/binary_size/PRESUBMIT.py
+++ b/tools/binary_size/PRESUBMIT.py
@@ -8,7 +8,6 @@
for more details about the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
@@ -32,10 +31,7 @@
output_api,
input_api.PresubmitLocalPath(),
files_to_check=[r'.+_test\.py$'],
- files_to_skip=[],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True)
+ files_to_skip=[])
output.extend(input_api.RunTests(py_tests, False))
return output
diff --git a/tools/checkperms/PRESUBMIT.py b/tools/checkperms/PRESUBMIT.py
index cd5d173..648589cc 100644
--- a/tools/checkperms/PRESUBMIT.py
+++ b/tools/checkperms/PRESUBMIT.py
@@ -9,18 +9,14 @@
"""
-USE_PYTHON3 = True
-
-
def CommonChecks(input_api, output_api):
output = []
output.extend(
input_api.canned_checks.RunPylint(input_api, output_api, version='2.7'))
# Run it like if it were a unit test.
output.extend(
- input_api.canned_checks.RunUnitTests(input_api,
- output_api, ['./checkperms.py'],
- run_on_python2=False))
+ input_api.canned_checks.RunUnitTests(input_api, output_api,
+ ['./checkperms.py']))
return output
diff --git a/tools/checkteamtags/PRESUBMIT.py b/tools/checkteamtags/PRESUBMIT.py
index 99f00bf5..1dfd911 100644
--- a/tools/checkteamtags/PRESUBMIT.py
+++ b/tools/checkteamtags/PRESUBMIT.py
@@ -9,9 +9,6 @@
"""
-USE_PYTHON3 = True
-
-
def CheckChangeOnUpload(input_api, output_api):
return _CommonChecks(input_api, output_api)
diff --git a/tools/clang/pylib/clang/PRESUBMIT.py b/tools/clang/pylib/clang/PRESUBMIT.py
index df54e08f..34dbacf 100644
--- a/tools/clang/pylib/clang/PRESUBMIT.py
+++ b/tools/clang/pylib/clang/PRESUBMIT.py
@@ -3,18 +3,12 @@
# found in the LICENSE file.
-USE_PYTHON3 = True
-
-
def CheckChangeOnCommit(input_api, output_api):
results = []
# Run the unit tests.
results.extend(
- input_api.canned_checks.RunUnitTestsInDirectory(input_api,
- output_api,
- '.', [r'^.+_test\.py$'],
- run_on_python2=False,
- skip_shebang_check=True))
+ input_api.canned_checks.RunUnitTestsInDirectory(input_api, output_api,
+ '.', [r'^.+_test\.py$']))
return results
diff --git a/tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py b/tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py
index e0d126e..5fc2b9b 100644
--- a/tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py
+++ b/tools/code_coverage/js_source_maps/create_js_source_maps/PRESUBMIT.py
@@ -8,7 +8,6 @@
"""
import sys
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
@@ -34,11 +33,8 @@
def CheckUnittests(input_api, output_api):
- results = input_api.canned_checks.RunUnitTests(
- input_api,
- output_api, [
- input_api.os_path.join(input_api.PresubmitLocalPath(), 'test',
- 'create_js_source_maps_test.py')
- ],
- run_on_python2=False)
+ results = input_api.canned_checks.RunUnitTests(input_api, output_api, [
+ input_api.os_path.join(input_api.PresubmitLocalPath(), 'test',
+ 'create_js_source_maps_test.py')
+ ])
return results
diff --git a/tools/cygprofile/PRESUBMIT.py b/tools/cygprofile/PRESUBMIT.py
index 5dbf70c..068a339 100644
--- a/tools/cygprofile/PRESUBMIT.py
+++ b/tools/cygprofile/PRESUBMIT.py
@@ -9,9 +9,6 @@
"""
-USE_PYTHON3 = True
-
-
def CommonChecks(input_api, output_api):
output = []
files_to_skip = []
@@ -25,13 +22,9 @@
# messages.
if input_api.sys.platform != 'win32':
output.extend(
- input_api.canned_checks.RunUnitTests(
- input_api,
- output_api, [
- input_api.os_path.join(input_api.PresubmitLocalPath(),
- 'run_tests')
- ],
- run_on_python2=False))
+ input_api.canned_checks.RunUnitTests(input_api, output_api, [
+ input_api.os_path.join(input_api.PresubmitLocalPath(), 'run_tests')
+ ]))
return output
diff --git a/tools/disable_tests/PRESUBMIT.py b/tools/disable_tests/PRESUBMIT.py
index 1462f6f0..8ce8b6e 100644
--- a/tools/disable_tests/PRESUBMIT.py
+++ b/tools/disable_tests/PRESUBMIT.py
@@ -7,8 +7,6 @@
for more details on the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
-
def _CommonChecks(input_api, output_api):
results = []
@@ -22,10 +20,7 @@
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath()),
files_to_check=[r'.+_test\.py$'],
- files_to_skip=['integration_test.py'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ files_to_skip=['integration_test.py']))
# integration_test.py uses subcommands, so we can't use the standard unit test
# presubmit API to run it.
@@ -35,7 +30,6 @@
cmd=['integration_test.py', 'run'],
kwargs={},
message=output_api.PresubmitError,
- python3=True,
))
results.extend(input_api.RunTests(commands))
diff --git a/tools/find_runtime_symbols/PRESUBMIT.py b/tools/find_runtime_symbols/PRESUBMIT.py
index 2f2c4428..09bd687 100644
--- a/tools/find_runtime_symbols/PRESUBMIT.py
+++ b/tools/find_runtime_symbols/PRESUBMIT.py
@@ -10,8 +10,6 @@
import sys
-USE_PYTHON3 = True
-
def CommonChecks(input_api, output_api):
def join(*args):
@@ -33,9 +31,7 @@
input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
- files_to_check=[r'.+_test\.py$'],
- run_on_python2=False,
- skip_shebang_check=True))
+ files_to_check=[r'.+_test\.py$']))
return output
diff --git a/tools/grit/PRESUBMIT.py b/tools/grit/PRESUBMIT.py
index c3028c6..91cb8a2 100644
--- a/tools/grit/PRESUBMIT.py
+++ b/tools/grit/PRESUBMIT.py
@@ -8,20 +8,14 @@
details on the presubmit API built into gcl.
"""
-USE_PYTHON3 = True
-
def RunUnittests(input_api, output_api):
presubmit_path = input_api.PresubmitLocalPath()
- return input_api.canned_checks.RunUnitTests(
- input_api,
- output_api, [
- input_api.os_path.join('grit', 'test_suite_all.py'),
- input_api.os_path.join(input_api.PresubmitLocalPath(),
- 'preprocess_if_expr_test.py')
- ],
- run_on_python2=False,
- skip_shebang_check=True)
+ return input_api.canned_checks.RunUnitTests(input_api, output_api, [
+ input_api.os_path.join('grit', 'test_suite_all.py'),
+ input_api.os_path.join(input_api.PresubmitLocalPath(),
+ 'preprocess_if_expr_test.py')
+ ])
def CheckChangeOnUpload(input_api, output_api):
diff --git a/tools/idl_parser/PRESUBMIT.py b/tools/idl_parser/PRESUBMIT.py
index 69ac9de..f9d52fa 100644
--- a/tools/idl_parser/PRESUBMIT.py
+++ b/tools/idl_parser/PRESUBMIT.py
@@ -2,19 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
CHECK_FILES = [r'^.+_test\.py$']
def _RunTests(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.',
- files_to_check=CHECK_FILES,
- run_on_python2=False,
- skip_shebang_check=True)
+ input_api, output_api, '.', files_to_check=CHECK_FILES)
def CheckChangeOnUpload(input_api, output_api):
diff --git a/tools/infra/PRESUBMIT.py b/tools/infra/PRESUBMIT.py
index 512cb70..152f9065 100644
--- a/tools/infra/PRESUBMIT.py
+++ b/tools/infra/PRESUBMIT.py
@@ -22,10 +22,7 @@
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath()),
files_to_check=[r'.+_unittest\.py$'],
- files_to_skip=[],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ files_to_skip=[]))
results.extend(input_api.RunTests(commands))
return results
diff --git a/tools/json_data_generator/PRESUBMIT.py b/tools/json_data_generator/PRESUBMIT.py
index 8f5313a..4ead6d2 100644
--- a/tools/json_data_generator/PRESUBMIT.py
+++ b/tools/json_data_generator/PRESUBMIT.py
@@ -8,7 +8,6 @@
"""
import os
-USE_PYTHON3 = True
TEST_PATTERNS = [r'.+_test.py$']
@@ -21,13 +20,7 @@
env['PYTHONPATH'] = input_api.os_path.pathsep.join((pythonpath))
return input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.',
- files_to_check=TEST_PATTERNS,
- env=env,
- run_on_python2=False,
- skip_shebang_check=True)
+ input_api, output_api, '.', files_to_check=TEST_PATTERNS, env=env)
def CheckChangeOnUpload(input_api, output_api):
diff --git a/tools/json_schema_compiler/PRESUBMIT.py b/tools/json_schema_compiler/PRESUBMIT.py
index cf1502e..ad70639 100644
--- a/tools/json_schema_compiler/PRESUBMIT.py
+++ b/tools/json_schema_compiler/PRESUBMIT.py
@@ -11,7 +11,6 @@
import sys
FILE_PATTERN = [ r'.+_test.py$' ]
-USE_PYTHON3 = True
def _CheckExterns(input_api, output_api):
@@ -28,15 +27,13 @@
def CheckChangeOnUpload(input_api, output_api):
ret = input_api.canned_checks.RunUnitTestsInDirectory(
- input_api, output_api, '.', files_to_check=FILE_PATTERN,
- run_on_python2=False)
+ input_api, output_api, '.', files_to_check=FILE_PATTERN)
ret += _CheckExterns(input_api, output_api)
return ret
def CheckChangeOnCommit(input_api, output_api):
ret = input_api.canned_checks.RunUnitTestsInDirectory(
- input_api, output_api, '.', files_to_check=FILE_PATTERN,
- run_on_python2=False)
+ input_api, output_api, '.', files_to_check=FILE_PATTERN)
ret += _CheckExterns(input_api, output_api)
return ret
diff --git a/tools/json_to_struct/PRESUBMIT.py b/tools/json_to_struct/PRESUBMIT.py
index 5cfc3f8..a301e40d 100644
--- a/tools/json_to_struct/PRESUBMIT.py
+++ b/tools/json_to_struct/PRESUBMIT.py
@@ -8,23 +8,14 @@
for more details about the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
ALLOWEDLIST = [r'.+_test.py$']
def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.',
- files_to_check=ALLOWEDLIST,
- run_on_python2=False)
+ input_api, output_api, '.', files_to_check=ALLOWEDLIST)
def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.',
- files_to_check=ALLOWEDLIST,
- run_on_python2=False)
+ input_api, output_api, '.', files_to_check=ALLOWEDLIST)
diff --git a/tools/licenses/PRESUBMIT.py b/tools/licenses/PRESUBMIT.py
index d20f393..985a497b 100644
--- a/tools/licenses/PRESUBMIT.py
+++ b/tools/licenses/PRESUBMIT.py
@@ -6,7 +6,6 @@
# This line is 'magic' in that git-cl looks for it to decide whether to
# use Python3 instead of Python2 when running the code in this file.
-USE_PYTHON3 = True
def CheckPythonTests(input_api, output_api):
@@ -15,7 +14,4 @@
input_api,
output_api,
input_api.PresubmitLocalPath(),
- files_to_check=[r'.+_(?:unit)?test\.py$'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ files_to_check=[r'.+_(?:unit)?test\.py$']))
diff --git a/tools/linux/PRESUBMIT.py b/tools/linux/PRESUBMIT.py
index 7edf2a0..02ce536 100644
--- a/tools/linux/PRESUBMIT.py
+++ b/tools/linux/PRESUBMIT.py
@@ -8,7 +8,6 @@
for more details on the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
import sys
@@ -33,9 +32,7 @@
input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
- files_to_check=[r'.+_tests\.py$'],
- run_on_python2=False,
- skip_shebang_check=True))
+ files_to_check=[r'.+_tests\.py$']))
return output
diff --git a/tools/mb/PRESUBMIT.py b/tools/mb/PRESUBMIT.py
index 26d29d5..fef2264 100644
--- a/tools/mb/PRESUBMIT.py
+++ b/tools/mb/PRESUBMIT.py
@@ -38,12 +38,8 @@
def CheckTests(input_api, output_api):
glob = input_api.os_path.join(input_api.PresubmitLocalPath(), '*_test.py')
- tests = input_api.canned_checks.GetUnitTests(input_api,
- output_api,
- input_api.glob(glob),
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True)
+ tests = input_api.canned_checks.GetUnitTests(input_api, output_api,
+ input_api.glob(glob))
return input_api.RunTests(tests)
@@ -68,13 +64,9 @@
# Run the MB unittests.
tests.extend(
- input_api.canned_checks.GetUnitTestsInDirectory(input_api,
- output_api,
+ input_api.canned_checks.GetUnitTestsInDirectory(input_api, output_api,
'.',
- [r'^.+_unittest\.py$'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ [r'^.+_unittest\.py$']))
# Validate the format of the mb_config.pyl file.
cmd = [input_api.python3_executable, 'mb.py', 'validate']
diff --git a/tools/media_engagement_preload/PRESUBMIT.py b/tools/media_engagement_preload/PRESUBMIT.py
index 899b6af..d9de17b 100644
--- a/tools/media_engagement_preload/PRESUBMIT.py
+++ b/tools/media_engagement_preload/PRESUBMIT.py
@@ -5,10 +5,6 @@
"""Chromium presubmit script for src/tools/media_engagement_preload."""
-# This line is 'magic' in that git-cl looks for it to decide whether to
-# use Python3 instead of Python2 when running the code in this file.
-USE_PYTHON3 = True
-
def _RunMakeDafsaTests(input_api, output_api):
"""Runs unittest for make_dafsa if any related file has been modified."""
@@ -22,9 +18,7 @@
input_api,
output_api,
input_api.PresubmitLocalPath(),
- files_to_check=['.*test\.py$'],
- run_on_python2=False,
- skip_shebang_check=True))
+ files_to_check=['.*test\.py$']))
def CheckChangeOnUpload(input_api, output_api):
diff --git a/tools/metrics/PRESUBMIT.py b/tools/metrics/PRESUBMIT.py
index f499189d..dd2c719d 100644
--- a/tools/metrics/PRESUBMIT.py
+++ b/tools/metrics/PRESUBMIT.py
@@ -7,7 +7,6 @@
for more details on the presubmit API built into gcl.
"""
-USE_PYTHON3 = True
UKM_XML = 'ukm.xml'
ENUMS_XML = 'enums.xml'
diff --git a/tools/metrics/actions/PRESUBMIT.py b/tools/metrics/actions/PRESUBMIT.py
index 656566e..daeb1b4 100644
--- a/tools/metrics/actions/PRESUBMIT.py
+++ b/tools/metrics/actions/PRESUBMIT.py
@@ -8,8 +8,6 @@
for more details on the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
-
def CheckChange(input_api, output_api):
"""Checks that actions.xml is up to date and pretty-printed."""
diff --git a/tools/metrics/histograms/PRESUBMIT.py b/tools/metrics/histograms/PRESUBMIT.py
index 6e3b880..d682c8a 100644
--- a/tools/metrics/histograms/PRESUBMIT.py
+++ b/tools/metrics/histograms/PRESUBMIT.py
@@ -7,7 +7,6 @@
for more details on the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
diff --git a/tools/metrics/structured/PRESUBMIT.py b/tools/metrics/structured/PRESUBMIT.py
index 21fb32a..f49353c 100644
--- a/tools/metrics/structured/PRESUBMIT.py
+++ b/tools/metrics/structured/PRESUBMIT.py
@@ -8,7 +8,6 @@
for more details on the presubmit API built into gcl.
"""
-USE_PYTHON3 = True
STRUCTURED_XML = 'structured.xml'
STRUCTURED_OLD_XML = 'structured.old.xml'
diff --git a/tools/metrics/ukm/PRESUBMIT.py b/tools/metrics/ukm/PRESUBMIT.py
index 50a0ec5..5da75c0 100644
--- a/tools/metrics/ukm/PRESUBMIT.py
+++ b/tools/metrics/ukm/PRESUBMIT.py
@@ -8,7 +8,6 @@
for more details on the presubmit API built into gcl.
"""
-USE_PYTHON3 = True
UKM_XML = 'ukm.xml'
diff --git a/tools/origin_trials/PRESUBMIT.py b/tools/origin_trials/PRESUBMIT.py
index 880dfa7..b4e86bf0 100644
--- a/tools/origin_trials/PRESUBMIT.py
+++ b/tools/origin_trials/PRESUBMIT.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
-
def _CommonChecks(input_api, output_api):
results = []
@@ -16,12 +14,9 @@
# Run the generate_token unittests.
results.extend(
- input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.', [r'^.+_unittest\.py$'],
- run_on_python2=not USE_PYTHON3,
- run_on_python3=USE_PYTHON3))
+ input_api.canned_checks.RunUnitTestsInDirectory(input_api, output_api,
+ '.',
+ [r'^.+_unittest\.py$']))
return results
diff --git a/tools/perf/PRESUBMIT.py b/tools/perf/PRESUBMIT.py
index fc1ce15..c585327 100644
--- a/tools/perf/PRESUBMIT.py
+++ b/tools/perf/PRESUBMIT.py
@@ -12,8 +12,6 @@
PRESUBMIT_VERSION = '2.0.0'
-USE_PYTHON3 = True
-
def _CommonChecks(input_api, output_api, block_on_failure=False):
"""Performs common checks that vary between commit and upload.
diff --git a/tools/perf/contrib/PRESUBMIT.py b/tools/perf/contrib/PRESUBMIT.py
index 3b081b4c..c79933b3 100644
--- a/tools/perf/contrib/PRESUBMIT.py
+++ b/tools/perf/contrib/PRESUBMIT.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
-
def _CommonChecks(input_api, output_api):
"""Performs common checks, which includes running pylint."""
diff --git a/tools/polymer/PRESUBMIT.py b/tools/polymer/PRESUBMIT.py
index d5ecd013..2b42724 100644
--- a/tools/polymer/PRESUBMIT.py
+++ b/tools/polymer/PRESUBMIT.py
@@ -8,8 +8,6 @@
for more details about the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
-
def RunPolymerTests(input_api, output_api):
presubmit_path = input_api.PresubmitLocalPath()
@@ -17,10 +15,7 @@
'html_to_js_test.py', 'html_to_wrapper_test.py', 'css_to_wrapper_test.py'
]
tests = [input_api.os_path.join(presubmit_path, s) for s in sources]
- return input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- tests,
- run_on_python2=False)
+ return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)
def _CheckChangeOnUploadOrCommit(input_api, output_api):
diff --git a/tools/resources/PRESUBMIT.py b/tools/resources/PRESUBMIT.py
index f07a4a35..02b7013 100644
--- a/tools/resources/PRESUBMIT.py
+++ b/tools/resources/PRESUBMIT.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
-
def CheckChangeOnUpload(*args):
return _CommonChecks(*args)
@@ -20,9 +18,6 @@
if any(f for f in files if f.startswith('svgo_presubmit')):
tests = [path.join(cwd, 'svgo_presubmit_test.py')]
- return input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- tests,
- run_on_python2=False)
+ return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)
return []
diff --git a/tools/tracing/PRESUBMIT.py b/tools/tracing/PRESUBMIT.py
index 4e70ce9..46c19449 100644
--- a/tools/tracing/PRESUBMIT.py
+++ b/tools/tracing/PRESUBMIT.py
@@ -8,7 +8,6 @@
"""
PRESUBMIT_VERSION = '2.0.0'
-USE_PYTHON3 = True
def RunUnittests(input_api, output_api):
@@ -21,12 +20,7 @@
results.extend(
input_api.canned_checks.RunUnitTestsInDirectory(
- input_api,
- output_api,
- '.',
- files_to_check=[r'.+_unittest\.py$'],
- run_on_python2=not USE_PYTHON3,
- skip_shebang_check=True))
+ input_api, output_api, '.', files_to_check=[r'.+_unittest\.py$']))
return results
diff --git a/tools/translation/PRESUBMIT.py b/tools/translation/PRESUBMIT.py
index f105bf81..7d7e3ae 100644
--- a/tools/translation/PRESUBMIT.py
+++ b/tools/translation/PRESUBMIT.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
-
def _CommonChecks(input_api, output_api):
results = []
@@ -16,20 +14,11 @@
# Run unittests.
tests = input_api.canned_checks.GetUnitTestsInDirectory(
- input_api,
- output_api,
- '.', [r'^.+_unittest\.py$'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True)
+ input_api, output_api, '.', [r'^.+_unittest\.py$'])
tests.extend(
- input_api.canned_checks.GetUnitTestsInDirectory(input_api,
- output_api,
+ input_api.canned_checks.GetUnitTestsInDirectory(input_api, output_api,
'helper',
- [r'^.+_unittest\.py$'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ [r'^.+_unittest\.py$']))
results.extend(input_api.RunTests(tests))
return results
diff --git a/tools/typescript/PRESUBMIT.py b/tools/typescript/PRESUBMIT.py
index 7727a393..f365afb 100644
--- a/tools/typescript/PRESUBMIT.py
+++ b/tools/typescript/PRESUBMIT.py
@@ -7,7 +7,6 @@
for more details about the presubmit API built into depot_tools.
"""
-USE_PYTHON3 = True
PRESUBMIT_VERSION = '2.0.0'
@@ -27,10 +26,7 @@
presubmit_path = input_api.PresubmitLocalPath()
sources = ['ts_library_test.py']
tests = [input_api.os_path.join(presubmit_path, s) for s in sources]
- return input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- tests,
- run_on_python2=False)
+ return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)
def CheckStyleESLint(input_api, output_api):
diff --git a/tools/vim/PRESUBMIT.py b/tools/vim/PRESUBMIT.py
index 55d2784..ebcbc63 100644
--- a/tools/vim/PRESUBMIT.py
+++ b/tools/vim/PRESUBMIT.py
@@ -6,8 +6,6 @@
Runs Python unit tests in /tools/vim/tests on upload.
"""
-USE_PYTHON3 = True
-
def CheckChangeOnUpload(input_api, output_api):
results = []
@@ -28,10 +26,7 @@
any([input_api.re.match(r'tests(/|\\)',f) for f in affected_files]):
results += input_api.RunTests(
input_api.canned_checks.GetUnitTests(
- input_api,
- output_api, ['tests/chromium.ycm_extra_conf_unittest.py'],
- run_on_python2=False,
- run_on_python3=True,
- skip_shebang_check=True))
+ input_api, output_api,
+ ['tests/chromium.ycm_extra_conf_unittest.py']))
return results
diff --git a/tools/web_dev_style/PRESUBMIT.py b/tools/web_dev_style/PRESUBMIT.py
index 64dcdb9..9d2b7e4 100644
--- a/tools/web_dev_style/PRESUBMIT.py
+++ b/tools/web_dev_style/PRESUBMIT.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-USE_PYTHON3 = True
-
def CheckChangeOnUpload(*args):
return _CommonChecks(*args)
@@ -16,7 +14,4 @@
def _CommonChecks(input_api, output_api):
tests = ['test_suite.py']
- return input_api.canned_checks.RunUnitTests(input_api,
- output_api,
- tests,
- run_on_python2=False)
+ return input_api.canned_checks.RunUnitTests(input_api, output_api, tests)