Remove obsolete utilities, particularly strip_prefix

PiperOrigin-RevId: 685674043

pytype/convert.py

@@ -653,7 +653,7 @@ def _create_module(self, ast):
     )
     members = {}
     for val in data:
-      name = utils.strip_prefix(val.name, f"{ast.name}.")
+      name = val.name.removeprefix(f"{ast.name}.")
       members[name] = val
     return abstract.Module(self.ctx, ast.name, members, ast)
 

pytype/pyi/CMakeLists.txt

@@ -64,7 +64,6 @@ py_library(
     .classdef
     .metadata
     .types
-    pytype.utils
     pytype.pytd.pytd_for_parser
     pytype.pytd.parse.parse
 )

pytype/pyi/definitions.py

@@ -6,7 +6,6 @@
 import itertools
 from typing import Any, TypeVar
 
-from pytype import utils
 from pytype.pyi import classdef
 from pytype.pyi import metadata
 from pytype.pyi import types
@@ -560,7 +559,7 @@ def matches_type(self, name: str, target: str | tuple[str, ...]):
       name = f"{prefix}.{name_base}"
     else:
       name = self._resolve_alias(name)
-    name = utils.strip_prefix(name, parser_constants.EXTERNAL_NAME_PREFIX)
+    name = name.removeprefix(parser_constants.EXTERNAL_NAME_PREFIX)
     if name == target:
       return True
     module, target_base = target.rsplit(".", 1)

pytype/pytd/CMakeLists.txt

@@ -191,7 +191,6 @@ py_library(
     ._pytd
     .pytd_utils
     .visitors
-    pytype.utils
     pytype.pyi.parser
 )
 
@@ -240,7 +239,6 @@ py_library(
     .printer
     .pytd_utils
     .pytd_visitors
-    pytype.utils
     pytype.pytd.parse.parse
 )
 

pytype/pytd/printer.py

@@ -99,7 +99,7 @@ def decrement_typing_count(self, member: str):
 
   def get_alias(self, name: str):
     if name.startswith("typing."):
-      return self._typing.members.get(utils.strip_prefix(name, "typing."))
+      return self._typing.members.get(name.removeprefix("typing."))
     return self._reverse_alias_map.get(name)
 
   def to_import_statements(self):
@@ -246,7 +246,7 @@ def _FromTyping(self, name):
 
   def _StripUnitPrefix(self, name):
     if self._unit:
-      return utils.strip_prefix(name, f"{self._unit.name}.")
+      return name.removeprefix(f"{self._unit.name}.")
     else:
       return name
 

pytype/pytd/serialize_ast.py

@@ -7,7 +7,6 @@
 
 
 import msgspec
-from pytype import utils
 from pytype.pyi import parser
 from pytype.pytd import pytd
 from pytype.pytd import pytd_utils
@@ -43,7 +42,7 @@ def __init__(self):
   def EnterTypeDeclUnit(self, node):
     for alias in node.aliases:
       if isinstance(alias.type, pytd.Module):
-        name = utils.strip_prefix(alias.name, f"{node.name}.")
+        name = alias.name.removeprefix(f"{node.name}.")
         self._module_aliases[name] = alias.type.module_name
 
   def VisitLateType(self, node):

pytype/pytd/visitors.py

@@ -9,7 +9,6 @@
 
 from pytype import datatypes
 from pytype import module_utils
-from pytype import utils
 from pytype.pytd import base_visitor
 from pytype.pytd import escape
 from pytype.pytd import mro
@@ -1321,9 +1320,7 @@ class StripExternalNamePrefix(Visitor):
   """
 
   def VisitNamedType(self, node):
-    new_name = utils.strip_prefix(
-        node.name, parser_constants.EXTERNAL_NAME_PREFIX
-    )
+    new_name = node.name.removeprefix(parser_constants.EXTERNAL_NAME_PREFIX)
     return node.Replace(name=new_name)
 
 

pytype/utils.py

@@ -2,9 +2,7 @@
 
 import collections
 import contextlib
-import itertools
 import keyword
-import re
 import threading
 import traceback
 import weakref
@@ -79,13 +77,6 @@ def validate_version(python_version):
     raise UsageError("Python versions > 3.12 are not yet supported.")
 
 
-def strip_prefix(string, prefix):
-  """Strip off prefix if it exists."""
-  if string.startswith(prefix):
-    return string[len(prefix) :]
-  return string
-
-
 def maybe_truncate(s, length=30):
   """Truncate long strings (and append '...'), but leave short strings alone."""
   s = str(s)
@@ -131,14 +122,6 @@ def pretty_dnf(dnf):
     return " | ".join(pretty_conjunction(c) for c in dnf)
 
 
-def numeric_sort_key(s):
-  return tuple((int(e) if e.isdigit() else e) for e in re.split(r"(\d+)", s))
-
-
-def concat_tuples(tuples):
-  return tuple(itertools.chain.from_iterable(tuples))
-
-
 def native_str(s: str | bytes, errors: str = "strict") -> str:
   """Convert a bytes object to the native str type."""
   if isinstance(s, str):

pytype/utils_test.py

@@ -8,13 +8,6 @@
 class UtilsTest(unittest.TestCase):
   """Test generic utilities."""
 
-  def test_numeric_sort_key(self):
-    k = utils.numeric_sort_key
-    self.assertLess(k("1aaa"), k("12aa"))
-    self.assertLess(k("12aa"), k("123a"))
-    self.assertLess(k("a1aa"), k("a12a"))
-    self.assertLess(k("a12a"), k("a123"))
-
   def test_pretty_dnf(self):
     dnf = [["a", "b"], "c", ["d", "e", "f"]]
     self.assertEqual(utils.pretty_dnf(dnf), "(a & b) | c | (d & e & f)")