Reduce types in splitinput.py (#15057)

Carreau · web-flow · commit b3edf5e417f2 · 2025-12-04T12:26:49.000+01:00
As far as I can tell, those are always strings, so should remove some
overhead.

Also deprecated and ruff-format the file.
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
@@ -498,7 +498,7 @@ def check(self, line_info):
         if not self.shell.autocall:
             return None
 
-        oinfo = line_info.ofind(self.shell) # This can mutate state via getattr
+        oinfo = self.shell._ofind(line_info.ifun)  # This can mutate state via getattr
         if not oinfo.found:
             return None
 
@@ -610,7 +610,7 @@ def handle(self, line_info):
         the_rest = line_info.the_rest
         esc     = line_info.esc
         continue_prompt = line_info.continue_prompt
-        obj = line_info.ofind(self.shell).obj
+        obj = self.shell._ofind(line_info.ifun).obj
 
         # This should only be active for single-line input!
         if continue_prompt:
diff --git a/IPython/core/splitinput.py b/IPython/core/splitinput.py
@@ -1,35 +1,21 @@
-# encoding: utf-8
 """
 Simple utility for splitting user input. This is used by both inputsplitter and
 prefilter.
-
-Authors:
-
-* Brian Granger
-* Fernando Perez
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Imports
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 import re
 import sys
+import warnings
 
-from IPython.utils import py3compat
-from IPython.utils.encoding import get_stream_enc
 from IPython.core.oinspect import OInfo
 
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Main function
-#-----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 # RegExp for splitting line contents into pre-char//first word-method//rest.
 # For clarity, each group in on one line.
@@ -42,34 +28,37 @@
 # ! and !! trigger if they are first char(s) *or* follow an indent
 # ? triggers as first or last char.
 
-line_split = re.compile(r"""
+line_split = re.compile(
+    r"""
              ^(\s*)               # any leading space
              ([,;/%]|!!?|\?\??)?  # escape character or characters
              \s*(%{0,2}[\w\.\*]*)     # function/method, possibly with leading %
                                   # to correctly treat things like '?%magic'
              (.*?$|$)             # rest of line
-             """, re.VERBOSE)
+             """,
+    re.VERBOSE,
+)
 
 
-def split_user_input(line, pattern=None):
+def split_user_input(
+    line: str, pattern: re.Pattern[str] | None = None
+) -> tuple[str, str, str, str]:
     """Split user input into initial whitespace, escape character, function part
     and the rest.
     """
-    # We need to ensure that the rest of this routine deals only with unicode
-    encoding = get_stream_enc(sys.stdin, 'utf-8')
-    line = py3compat.cast_unicode(line, encoding)
+    assert isinstance(line, str)
 
     if pattern is None:
         pattern = line_split
     match = pattern.match(line)
     if not match:
         # print("match failed for line '%s'" % line)
         try:
-            ifun, the_rest = line.split(None,1)
+            ifun, the_rest = line.split(None, 1)
         except ValueError:
             # print("split failed for line '%s'" % line)
-            ifun, the_rest = line, u''
-        pre = re.match(r'^(\s*)(.*)',line).groups()[0]
+            ifun, the_rest = line, ""
+        pre = re.match(r"^(\s*)(.*)", line).groups()[0]
         esc = ""
     else:
         pre, esc, ifun, the_rest = match.groups()
@@ -111,15 +100,27 @@ class LineInfo:
     raw_the_rest
       the_rest without whitespace stripped.
     """
-    def __init__(self, line, continue_prompt=False):
-        self.line            = line
+
+    line: str
+    continue_prompt: bool
+    pre: str
+    esc: str
+    ifun: str
+    raw_the_rest: str
+    the_rest: str
+    pre_char: str
+    pre_whitespace: str
+
+    def __init__(self, line: str, continue_prompt: bool = False) -> None:
+        assert isinstance(line, str)
+        self.line = line
         self.continue_prompt = continue_prompt
         self.pre, self.esc, self.ifun, self.raw_the_rest = split_user_input(line)
         self.the_rest = self.raw_the_rest.lstrip()
 
-        self.pre_char       = self.pre.strip()
+        self.pre_char = self.pre.strip()
         if self.pre_char:
-            self.pre_whitespace = '' # No whitespace allowed before esc chars
+            self.pre_whitespace = ""  # No whitespace allowed before esc chars
         else:
             self.pre_whitespace = self.pre
 
@@ -135,11 +136,20 @@ def ofind(self, ip) -> OInfo:
 
         Does cache the results of the call, so can be called multiple times
         without worrying about *further* damaging state.
+
+        .. deprecated:: 9.8
+            Use ``shell._ofind(line_info.ifun)`` directly instead.
         """
+        warnings.warn(
+            "LineInfo.ofind() is deprecated since IPython 9.9. "
+            "Use shell._ofind(line_info.ifun) directly instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         return ip._ofind(self.ifun)
 
-    def __str__(self):
-        return "LineInfo [%s|%s|%s|%s]" %(self.pre, self.esc, self.ifun, self.the_rest)
+    def __str__(self) -> str:
+        return "LineInfo [%s|%s|%s|%s]" % (self.pre, self.esc, self.ifun, self.the_rest)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<" + str(self) + ">"
