Rename/move strip_prefix -> removeprefix. NFC (emscripten-core#19723)

sbc100 · web-flow · commit b9f7ecb8b215 · 2023-06-28T11:09:51.000-07:00
This matches the name of the of the python3.9 builtin.
diff --git a/emcc.py b/emcc.py
@@ -45,7 +45,7 @@
 from tools import colored_logger, diagnostics, building
 from tools.shared import unsuffixed, unsuffixed_basename, WINDOWS, safe_copy
 from tools.shared import run_process, read_and_preprocess, exit_with_error, DEBUG
-from tools.shared import do_replace, strip_prefix
+from tools.shared import do_replace
 from tools.response_file import substitute_response_files
 from tools.minimal_runtime_shell import generate_minimal_runtime_html
 import tools.line_endings
@@ -55,7 +55,7 @@
 from tools import config
 from tools import cache
 from tools.settings import user_settings, settings, MEM_SIZE_SETTINGS, COMPILE_TIME_SETTINGS
-from tools.utils import read_file, write_file, read_binary, delete_file
+from tools.utils import read_file, write_file, read_binary, delete_file, removeprefix
 
 logger = logging.getLogger('emcc')
 
@@ -439,7 +439,7 @@ def apply_user_settings():
 
     filename = None
     if value and value[0] == '@':
-      filename = strip_prefix(value, '@')
+      filename = removeprefix(value, '@')
       if not os.path.exists(filename):
         exit_with_error('%s: file not found parsing argument: %s=%s' % (filename, key, value))
       value = read_file(filename).strip()
@@ -774,7 +774,7 @@ def is_dash_s_for_emcc(args, i):
       return False
     arg = args[i + 1]
   else:
-    arg = strip_prefix(args[i], '-s')
+    arg = removeprefix(args[i], '-s')
   arg = arg.split('=')[0]
   return arg.isidentifier() and arg.isupper()
 
@@ -834,7 +834,7 @@ def process_dynamic_libs(dylibs, lib_dirs):
     # EM_JS function are exports with a special prefix.  We need to strip
     # this prefix to get the actaul symbol name.  For the main module, this
     # is handled by extract_metadata.py.
-    exports = [shared.maybe_strip_prefix(e, '__em_js__') for e in exports]
+    exports = [utils.removeprefix(e, '__em_js__') for e in exports]
     settings.SIDE_MODULE_EXPORTS.extend(sorted(exports))
 
     imports = webassembly.get_imports(dylib)
@@ -874,7 +874,7 @@ def parse_s_args(args):
           key = args[i + 1]
           args[i + 1] = ''
         else:
-          key = strip_prefix(args[i], '-s')
+          key = removeprefix(args[i], '-s')
         args[i] = ''
 
         # If not = is specified default to 1
@@ -1374,7 +1374,7 @@ def normalize_boolean_setting(name, value):
   # and we can't just flip them, so leave them as-is to be
   # handled in a special way later)
   if name.startswith('NO_') and value in ('0', '1'):
-    name = strip_prefix(name, 'NO_')
+    name = removeprefix(name, 'NO_')
     value = str(1 - int(value))
   return name, value
 
@@ -1490,7 +1490,7 @@ def phase_setup(options, state, newargs):
         # For shared libraries that are neither bitcode nor wasm, assuming its local native
         # library and attempt to find a library by the same name in our own library path.
         # TODO(sbc): Do we really need this feature?  See test_other.py:test_local_link
-        libname = strip_prefix(get_library_basename(arg), 'lib')
+        libname = removeprefix(get_library_basename(arg), 'lib')
         flag = '-l' + libname
         diagnostics.warning('map-unrecognized-libraries', f'unrecognized file type: `{arg}`.  Mapping to `{flag}` and hoping for the best')
         add_link_flag(state, i, flag)
@@ -2963,7 +2963,7 @@ def get_language_mode(args):
         return_next = True
         continue
       if item.startswith('-x'):
-        return strip_prefix(item, '-x')
+        return removeprefix(item, '-x')
     return ''
 
   language_mode = get_language_mode(newargs)
@@ -3371,7 +3371,7 @@ def consume_arg_file():
 
     if arg.startswith('-O'):
       # Let -O default to -O2, which is what gcc does.
-      requested_level = strip_prefix(arg, '-O') or '2'
+      requested_level = removeprefix(arg, '-O') or '2'
       if requested_level == 's':
         requested_level = 2
         settings.SHRINK_LEVEL = 1
@@ -3432,7 +3432,7 @@ def consume_arg_file():
       settings.DEBUG_LEVEL = max(1, settings.DEBUG_LEVEL)
     elif arg.startswith('-g'):
       options.requested_debug = arg
-      requested_level = strip_prefix(arg, '-g') or '3'
+      requested_level = removeprefix(arg, '-g') or '3'
       if is_int(requested_level):
         # the -gX value is the debug level (-g1, -g2, etc.)
         settings.DEBUG_LEVEL = validate_arg_level(requested_level, 4, 'invalid debug level: ' + arg)
@@ -3610,7 +3610,7 @@ def consume_arg_file():
     elif arg == '-frtti':
       settings.USE_RTTI = 1
     elif arg.startswith('-jsD'):
-      key = strip_prefix(arg, '-jsD')
+      key = removeprefix(arg, '-jsD')
       if '=' in key:
         key, value = key.split('=')
       else:
@@ -3626,7 +3626,7 @@ def consume_arg_file():
     elif check_arg('-o'):
       options.output_file = consume_arg()
     elif arg.startswith('-o'):
-      options.output_file = strip_prefix(arg, '-o')
+      options.output_file = removeprefix(arg, '-o')
       newargs[i] = ''
     elif arg == '-mllvm':
       # Ignore the next argument rather than trying to parse it.  This is needed
@@ -4191,7 +4191,7 @@ def process_libraries(state, linker_inputs):
     if not flag.startswith('-l'):
       new_flags.append((i, flag))
       continue
-    lib = strip_prefix(flag, '-l')
+    lib = removeprefix(flag, '-l')
 
     logger.debug('looking for library "%s"', lib)
     js_libs, native_lib = building.map_to_js_libs(lib)
diff --git a/emscripten.py b/emscripten.py
@@ -26,9 +26,9 @@
 from tools import utils
 from tools import webassembly
 from tools import extract_metadata
-from tools.utils import exit_with_error, path_from_root
+from tools.utils import exit_with_error, path_from_root, removeprefix
 from tools.shared import DEBUG, asmjs_mangle
-from tools.shared import treat_as_user_function, strip_prefix
+from tools.shared import treat_as_user_function
 from tools.settings import settings
 
 logger = logging.getLogger('emscripten')
@@ -618,7 +618,7 @@ def create_em_js(metadata):
       args = []
     else:
       args = args.split(',')
-    arg_names = [arg.split()[-1].replace("*", "") for arg in args if arg]
+    arg_names = [arg.split()[-1].replace('*', '') for arg in args if arg]
     args = ','.join(arg_names)
     func = f'function {name}({args}) {body}'
     if (settings.MAIN_MODULE or settings.ASYNCIFY == 2) and name in metadata.emJsFuncTypes:
@@ -847,7 +847,7 @@ def create_invoke_wrappers(metadata):
   """Asm.js-style exception handling: invoke wrapper generation."""
   invoke_wrappers = ''
   for invoke in metadata.invokeFuncs:
-    sig = strip_prefix(invoke, 'invoke_')
+    sig = removeprefix(invoke, 'invoke_')
     invoke_wrappers += '\n' + js_manipulation.make_invoke(sig) + '\n'
   return invoke_wrappers
 
diff --git a/tools/extract_metadata.py b/tools/extract_metadata.py
@@ -6,7 +6,7 @@
 import logging
 from typing import List, Dict
 
-from . import webassembly
+from . import webassembly, utils
 from .webassembly import OpCode, AtomicOpCode, MemoryOpCode
 from .shared import exit_with_error
 from .settings import settings
@@ -306,7 +306,7 @@ def extract_metadata(filename):
     export_map = {e.name: e for e in exports}
     for e in exports:
       if e.kind == webassembly.ExternType.GLOBAL and e.name.startswith('__em_js__'):
-        name = e.name[len('__em_js__'):]
+        name = utils.removeprefix(e.name, '__em_js__')
         globl = module.get_global(e.index)
         string_address = get_global_value(globl)
         em_js_funcs[name] = get_string_at(module, string_address)
diff --git a/tools/shared.py b/tools/shared.py
@@ -668,18 +668,6 @@ def unsuffixed_basename(name):
   return os.path.basename(unsuffixed(name))
 
 
-def strip_prefix(string, prefix):
-  assert string.startswith(prefix)
-  return string[len(prefix):]
-
-
-def maybe_strip_prefix(string, prefix):
-  if string.startswith(prefix):
-    return string[len(prefix):]
-  else:
-    return string
-
-
 def make_writable(filename):
   assert os.path.isfile(filename)
   old_mode = stat.S_IMODE(os.stat(filename).st_mode)
diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -431,7 +431,7 @@ def get_link_flag(self):
       return fullpath
     # For libraries (.a) files, we pass the abbreviated `-l` form.
     base = shared.unsuffixed_basename(fullpath)
-    return '-l' + shared.strip_prefix(base, 'lib')
+    return '-l' + utils.removeprefix(base, 'lib')
 
   def get_files(self):
     """
diff --git a/tools/utils.py b/tools/utils.py
@@ -29,6 +29,13 @@ def safe_ensure_dirs(dirname):
   os.makedirs(dirname, exist_ok=True)
 
 
+# TODO(sbc): Replace with str.removeprefix once we update to python3.9
+def removeprefix(string, prefix):
+  if string.startswith(prefix):
+    return string[len(prefix):]
+  return string
+
+
 @contextlib.contextmanager
 def chdir(dir):
   """A context manager that performs actions in the given directory."""
diff --git a/tools/wasm-sourcemap.py b/tools/wasm-sourcemap.py
@@ -24,6 +24,8 @@
 __rootdir__ = os.path.dirname(__scriptdir__)
 sys.path.insert(0, __rootdir__)
 
+from tools import utils
+
 logger = logging.getLogger('wasm-sourcemap')
 
 
@@ -62,9 +64,9 @@ def resolve(self, name):
     for p in self.prefixes:
       if name.startswith(p['prefix']):
         if p['replacement'] is None:
-          result = name[len(p['prefix'])::]
+          result = utils.removeprefix(name, p['prefix'])
         else:
-          result = p['replacement'] + name[len(p['prefix'])::]
+          result = p['replacement'] + utils.removeprefix(name, p['prefix'])
         break
     self.cache[name] = result
     return result
