Snap for 7132927 from a3ae3b069e87f3bcc3073409a2d7c64e50abe20b to mainline-cellbroadcast-releaseandroid-mainline-11.0.0_r37android-mainline-11.0.0_r26android-mainline-11.0.0_r13android11-mainline-cellbroadcast-release

Change-Id: I4dab4bd93207e016d319c14924084458978b450a

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 '