diff options
author | Mike Frysinger <vapier@google.com> | 2021-02-05 04:46:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 04:46:24 +0000 |
commit | a3ae3b069e87f3bcc3073409a2d7c64e50abe20b (patch) | |
tree | 452a13ed8070f7cee303a3daa9388dea0efff390 | |
parent | 8d4e66d9c2c10aba89fc0ce47d515b8872d03912 (diff) | |
parent | f1e0b3bf4f30cf004fdd6f814ddc4712a3f8ee8c (diff) | |
download | repohooks-a3ae3b069e87f3bcc3073409a2d7c64e50abe20b.tar.gz |
android_test_mapping_format: drop Python 2 support am: f1e0b3bf4ftemp_ab_7272582androidx-leanback-release
Original change: https://android-review.googlesource.com/c/platform/tools/repohooks/+/1570580
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16d6ba29799efe3db4918d3bf8163d4d2e0b8100
-rwxr-xr-x | tools/android_test_mapping_format.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/android_test_mapping_format.py b/tools/android_test_mapping_format.py index b87b886..1e654e6 100755 --- a/tools/android_test_mapping_format.py +++ b/tools/android_test_mapping_format.py @@ -53,13 +53,6 @@ TEST_MAPPING_URL = ( _COMMENTS_RE = re.compile(r'^\s*//') -if sys.version_info.major < 3: - # pylint: disable=basestring-builtin,undefined-variable - string_types = basestring -else: - string_types = str - - class Error(Exception): """Base exception for all custom exceptions in this module.""" @@ -125,14 +118,14 @@ def _validate_test(test, test_mapping_file): 'Failed test config: %s' % (test_mapping_file, test)) preferred_targets = test.get(PREFERRED_TARGETS, []) if (not isinstance(preferred_targets, list) or - any(not isinstance(t, string_types) for t in preferred_targets)): + any(not isinstance(t, str) for t in preferred_targets)): raise InvalidTestMappingError( 'Invalid test config in test mapping file %s. `preferred_targets` ' 'setting in test config can only be a list of strings. Failed test ' 'config: %s' % (test_mapping_file, test)) file_patterns = test.get(FILE_PATTERNS, []) if (not isinstance(file_patterns, list) or - any(not isinstance(p, string_types) for p in file_patterns)): + any(not isinstance(p, str) for p in file_patterns)): raise InvalidTestMappingError( 'Invalid test config in test mapping file %s. `file_patterns` ' 'setting in test config can only be a list of strings. Failed test ' |