NotificationsYou must be signed in to change notification settings
Fork3.1k
Star20.1k

Commit72c413d

authored

stubgen: UseGenerator type var defaults (#17670)

1 parent0c10367 commit72c413dCopy full SHA for 72c413d

File tree

2 files changed

+27

-20

lines changed

mypy
- stubgen.py
test-data/unit
- stubgen.test

2 files changed

+27

-20

lines changed

`‎mypy/stubgen.py‎`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -588,8 +588,8 @@ def _get_func_return(self, o: FuncDef, ctx: FunctionContext) -> str \| None:`
`588`	`588`	`ifhas_yield_expression(o)orhas_yield_from_expression(o):`
`589`	`589`	`generator_name=self.add_name("collections.abc.Generator")`
`590`	`590`	`yield_name="None"`
`591`		`-send_name="None"`
`592`		`-return_name="None"`
	`591`	`+send_name:str\|None=None`
	`592`	`+return_name:str\|None=None`
`593`	`593`	`ifhas_yield_from_expression(o):`
`594`	`594`	`yield_name=send_name=self.add_name("_typeshed.Incomplete")`
`595`	`595`	`else:`
`@@ -600,7 +600,14 @@ def _get_func_return(self, o: FuncDef, ctx: FunctionContext) -> str \| None:`
`600`	`600`	`send_name=self.add_name("_typeshed.Incomplete")`
`601`	`601`	`ifhas_return_statement(o):`
`602`	`602`	`return_name=self.add_name("_typeshed.Incomplete")`
`603`		`-returnf"{generator_name}[{yield_name},{send_name},{return_name}]"`
	`603`	`+ifreturn_nameisnotNone:`
	`604`	`+ifsend_nameisNone:`
	`605`	`+send_name="None"`
	`606`	`+returnf"{generator_name}[{yield_name},{send_name},{return_name}]"`
	`607`	`+elifsend_nameisnotNone:`
	`608`	`+returnf"{generator_name}[{yield_name},{send_name}]"`
	`609`	`+else:`
	`610`	`+returnf"{generator_name}[{yield_name}]"`
`604`	`611`	`ifnothas_return_statement(o)ando.abstract_status==NOT_ABSTRACT:`
`605`	`612`	`return"None"`
`606`	`613`	`returnNone`

`‎test-data/unit/stubgen.test‎`

Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -1640,11 +1640,11 @@ def all():`
`1640`	`1640`	`from _typeshed import Incomplete`
`1641`	`1641`	`from collections.abc import Generator`
`1642`	`1642`
`1643`		`-def f() -> Generator[Incomplete, None, None]: ...`
`1644`		`-def g() -> Generator[None, Incomplete, None]: ...`
`1645`		`-def h1() -> Generator[None, None, None]: ...`
	`1643`	`+def f() -> Generator[Incomplete]: ...`
	`1644`	`+def g() -> Generator[None, Incomplete]: ...`
	`1645`	`+def h1() -> Generator[None]: ...`
`1646`	`1646`	`def h2() -> Generator[None, None, Incomplete]: ...`
`1647`		`-def h3() -> Generator[None, None, None]: ...`
	`1647`	`+def h3() -> Generator[None]: ...`
`1648`	`1648`	`def all() -> Generator[Incomplete, Incomplete, Incomplete]: ...`
`1649`	`1649`
`1650`	`1650`	`[case testFunctionYieldsNone]`
`@@ -1656,8 +1656,8 @@ def g():`
`1656`	`1656`	`[out]`
`1657`	`1657`	`from collections.abc import Generator`
`1658`	`1658`
`1659`		`-def f() -> Generator[None, None, None]: ...`
`1660`		`-def g() -> Generator[None, None, None]: ...`
	`1659`	`+def f() -> Generator[None]: ...`
	`1660`	`+def g() -> Generator[None]: ...`
`1661`	`1661`
`1662`	`1662`	`[case testGeneratorAlreadyDefined]`
`1663`	`1663`	`class Generator:`
`@@ -1671,7 +1671,7 @@ from collections.abc import Generator as _Generator`
`1671`	`1671`
`1672`	`1672`	`class Generator: ...`
`1673`	`1673`
`1674`		`-def f() -> _Generator[Incomplete, None, None]: ...`
	`1674`	`+def f() -> _Generator[Incomplete]: ...`
`1675`	`1675`
`1676`	`1676`	`[case testGeneratorYieldFrom]`
`1677`	`1677`	`def g1():`
`@@ -1692,10 +1692,10 @@ def g5():`
`1692`	`1692`	`from _typeshed import Incomplete`
`1693`	`1693`	`from collections.abc import Generator`
`1694`	`1694`
`1695`		`-def g1() -> Generator[Incomplete, Incomplete, None]: ...`
`1696`		`-def g2() -> Generator[Incomplete, Incomplete, None]: ...`
`1697`		`-def g3() -> Generator[Incomplete, Incomplete, None]: ...`
`1698`		`-def g4() -> Generator[Incomplete, Incomplete, None]: ...`
	`1695`	`+def g1() -> Generator[Incomplete, Incomplete]: ...`
	`1696`	`+def g2() -> Generator[Incomplete, Incomplete]: ...`
	`1697`	`+def g3() -> Generator[Incomplete, Incomplete]: ...`
	`1698`	`+def g4() -> Generator[Incomplete, Incomplete]: ...`
`1699`	`1699`	`def g5() -> Generator[Incomplete, Incomplete, Incomplete]: ...`
`1700`	`1700`
`1701`	`1701`	`[case testGeneratorYieldAndYieldFrom]`
`@@ -1728,13 +1728,13 @@ def g7():`
`1728`	`1728`	`from _typeshed import Incomplete`
`1729`	`1729`	`from collections.abc import Generator`
`1730`	`1730`
`1731`		`-def g1() -> Generator[Incomplete, Incomplete, None]: ...`
`1732`		`-def g2() -> Generator[Incomplete, Incomplete, None]: ...`
`1733`		`-def g3() -> Generator[Incomplete, Incomplete, None]: ...`
`1734`		`-def g4() -> Generator[Incomplete, Incomplete, None]: ...`
`1735`		`-def g5() -> Generator[Incomplete, Incomplete, None]: ...`
	`1731`	`+def g1() -> Generator[Incomplete, Incomplete]: ...`
	`1732`	`+def g2() -> Generator[Incomplete, Incomplete]: ...`
	`1733`	`+def g3() -> Generator[Incomplete, Incomplete]: ...`
	`1734`	`+def g4() -> Generator[Incomplete, Incomplete]: ...`
	`1735`	`+def g5() -> Generator[Incomplete, Incomplete]: ...`
`1736`	`1736`	`def g6() -> Generator[Incomplete, Incomplete, Incomplete]: ...`
`1737`		`-def g7() -> Generator[Incomplete, Incomplete, None]: ...`
	`1737`	`+def g7() -> Generator[Incomplete, Incomplete]: ...`
`1738`	`1738`
`1739`	`1739`	`[case testCallable]`
`1740`	`1740`	`from typing import Callable`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit72c413d

File tree

2 files changed

2 files changed

`‎mypy/stubgen.py‎`

`‎test-data/unit/stubgen.test‎`

0 commit comments