Fix failing stubgen tests (#16779)

Author: hamdanal

.github/workflows/test_stubgenc.yml

@@ -10,6 +10,7 @@ on:
     - 'misc/test-stubgenc.sh'
     - 'mypy/stubgenc.py'
     - 'mypy/stubdoc.py'
+    - 'mypy/stubutil.py'
     - 'test-data/stubgen/**'
 
 permissions:

.pre-commit-config.yaml

@@ -9,6 +9,7 @@ repos:
     rev: 23.9.1  # must match test-requirements.txt
     hooks:
       - id: black
+        exclude: '^(test-data/)'
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.4  # must match test-requirements.txt
     hooks:

test-data/pybind11_fixtures/expected_stubs_no_docs/pybind11_fixtures/__init__.pyi

@@ -1,6 +1,6 @@
 import os
 from . import demo as demo
-from typing import List, Optional, Tuple, overload
+from typing import List, Tuple, overload
 
 class StaticMethods:
     def __init__(self, *args, **kwargs) -> None: ...
@@ -21,7 +21,7 @@ class TestStruct:
     def field_readonly(self) -> int: ...
 
 def func_incomplete_signature(*args, **kwargs): ...
-def func_returning_optional() -> Optional[int]: ...
+def func_returning_optional() -> int | None: ...
 def func_returning_pair() -> Tuple[int, float]: ...
 def func_returning_path() -> os.PathLike: ...
 def func_returning_vector() -> List[float]: ...

test-data/pybind11_fixtures/expected_stubs_with_docs/pybind11_fixtures/__init__.pyi

@@ -1,6 +1,6 @@
 import os
 from . import demo as demo
-from typing import List, Optional, Tuple, overload
+from typing import List, Tuple, overload
 
 class StaticMethods:
     def __init__(self, *args, **kwargs) -> None:
@@ -42,7 +42,7 @@ class TestStruct:
 
 def func_incomplete_signature(*args, **kwargs):
     """func_incomplete_signature() -> dummy_sub_namespace::HasNoBinding"""
-def func_returning_optional() -> Optional[int]:
+def func_returning_optional() -> int | None:
     """func_returning_optional() -> Optional[int]"""
 def func_returning_pair() -> Tuple[int, float]:
     """func_returning_pair() -> Tuple[int, float]"""