some stricter typing

Carreau · Carreau · commit db0fde0f4911 · 2025-09-18T17:24:39.000+02:00
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
@@ -336,7 +336,10 @@ def _format_exception_only(
                     )
                 )
                 if textline == "":
-                    textline = py3compat.cast_unicode(value.text, "utf-8")
+                    # sep 2025:
+                    # textline = py3compat.cast_unicode(value.text, "utf-8")
+                    assert isinstance(value.text, str)
+                    textline = value.text
 
                 if textline is not None:
                     i = 0
@@ -425,7 +428,7 @@ def show_exception_only(
     def _some_str(self, value: Any) -> str:
         # Lifted from traceback.py
         try:
-            return py3compat.cast_unicode(str(value))
+            return str(value)
         except:
             return "<unprintable %s object>" % type(value).__name__
 
@@ -704,16 +707,19 @@ def format_exception(self, etype, evalue):
         if not isinstance(notes, Sequence) or isinstance(notes, (str, bytes)):
             notes = [_safe_string(notes, "__notes__", func=repr)]
 
+        for note in notes:
+            assert isinstance(note, str)
+
+        str_notes: Sequence[str] = notes
+
         # ... and format it
         return [
             theme_table[self._theme_name].format(
                 [(Token.ExcName, etype_str), (Token, ": "), (Token, evalue_str)]
             ),
             *(
-                theme_table[self._theme_name].format(
-                    [(Token, _safe_string(py3compat.cast_unicode(n), "note"))]
-                )
-                for n in notes
+                theme_table[self._theme_name].format([(Token, note)])
+                for note in str_notes
             ),
         ]
 
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -187,9 +187,9 @@ def match_target(s: str) -> str:
         else:
             pred = pattern
         if not prune:
-            return type(self)([el for el in self if pred(match_target(el))])
+            return type(self)([el for el in self if pred(match_target(el))])  # type: ignore [no-untyped-call]
         else:
-            return type(self)([el for el in self if not pred(match_target(el))])
+            return type(self)([el for el in self if not pred(match_target(el))])  # type: ignore [no-untyped-call]
 
     def fields(self, *fields: List[str]) -> List[List[str]]:
         """Collect whitespace-separated fields from string list
diff --git a/pyproject.toml b/pyproject.toml
@@ -111,8 +111,9 @@ exclude = [
    'IPython/sphinxext/ipython_directive.py',
    'IPython/terminal/ipapp.py',
    'IPython/utils/path.py',
+   'IPython/core/debugger_backport.py',
 ]
-# check_untyped_defs = true
+check_untyped_defs = true
 # disallow_untyped_calls = true
 # disallow_untyped_decorators = true
 # ignore_errors = false
@@ -127,6 +128,7 @@ enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 [[tool.mypy.overrides]]
 module = [
     "IPython.core.crashhandler",
+    "IPython.utils.text",
 ]
 check_untyped_defs = true
 disallow_incomplete_defs = true
@@ -138,23 +140,15 @@ ignore_missing_imports = false
 
 [[tool.mypy.overrides]]
 module = [
-    "IPython.utils.text",
+    "IPython.core.ultratb",
 ]
-disallow_untyped_defs = true
 check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_untyped_calls = false
 disallow_untyped_decorators = true
-
-[[tool.mypy.overrides]]
-module = [
-    "IPython.core.ultratb",
-]
 disallow_untyped_defs = false
 ignore_errors = false
 ignore_missing_imports = false
-disallow_untyped_calls = false
-disallow_incomplete_defs = true
-check_untyped_defs = true
-disallow_untyped_decorators = true
 
 [[tool.mypy.overrides]]
 module = [
