Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Properly strip types that come before a [ #16139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tbuzzelli wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Properly strip types that come before a [ #16139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e5ce32
Properly strip types that come before a [
tbuzzelli Sep 18, 2023
759ee97
Update teststubgen.py
tbuzzelli Sep 21, 2023
a41e5f3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 21, 2023
9b302f1
Merge branch 'master' into patch-1
tbuzzelli Sep 21, 2023
aad9c75
Update teststubgen.py
tbuzzelli Sep 21, 2023
763775d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mypy/stubgenc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def strip_or_import(
stripped_subtyp = strip_or_import(subtyp.strip(), module, known_modules, imports)
if stripped_subtyp != subtyp:
stripped_type = re.sub(
r"(^|[\[, ]+)" + re.escape(subtyp) + r"($|[\], ]+)",
r"(^|[\[, ]+)" + re.escape(subtyp) + r"($|[\[\], ]+)",
r"\1" + stripped_subtyp + r"\2",
stripped_type,
)
Expand Down
30 changes: 30 additions & 0 deletions mypy/test/teststubgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,36 @@ def test(arg0: str) -> None:
assert_equal(output, ["def test(arg0: argparse.Action) -> argparse.Action: ..."])
assert_equal(set(imports), {"import argparse"})

def test_generate_c_function_same_module_custom_nested(self) -> None:
"""Test that if annotation references a complicated nested type from same module but using full path,
no module will be imported, and type specification will be striped to local reference.
"""

# Provide different type in python spec than in docstring to make sure, that docstring
# information is used.
def test(arg0: str) -> None:
"""
test(arg0: argparse.Action[int, argparse.OtherType[str]]) -> argparse.Action[argparse.OtherType[str,str], int]
"""

output: list[str] = []
imports: list[str] = []
mod = ModuleType("argparse", "")
generate_c_function_stub(
mod,
"test",
test,
output=output,
imports=imports,
known_modules=[mod.__name__],
sig_generators=get_sig_generators(parse_options([])),
)
assert_equal(
output,
["def test(arg0: Action[int,OtherType[str]]) -> Action[OtherType[str,str],int]: ..."],
)
assert_equal(imports, [])

def test_generate_c_function_same_module_nested(self) -> None:
"""Test that if annotation references type from same module but using full path, no module
will be imported, and type specification will be stripped to local reference.
Expand Down