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

Skip to content

stubgen: Handle commas in namedtuple field definition #10828

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

Merged
JelleZijlstra merged 2 commits into from
Jul 16, 2021
Merged

stubgen: Handle commas in namedtuple field definition #10828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb89510
Handle spaces and commas in namedtuple syntax, add test
ismeta Jul 16, 2021
e9502ba
Add test case for two commas in a row
ismeta Jul 16, 2021
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/stubgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ def process_namedtuple(self, lvalue: NameExpr, rvalue: CallExpr) -> None:
if self._state != EMPTY:
self.add('\n')
if isinstance(rvalue.args[1], StrExpr):
items = rvalue.args[1].value.split(" ")
items = rvalue.args[1].value.replace(',', ' ').split()
Comment thread
emmatyping marked this conversation as resolved.
elif isinstance(rvalue.args[1], (ListExpr, TupleExpr)):
list_items = cast(List[StrExpr], rvalue.args[1].items)
items = [item.value for item in list_items]
Expand Down
22 changes: 22 additions & 0 deletions test-data/unit/stubgen.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,28 @@ xx
[out]
from typing import Any, NamedTuple

class X(NamedTuple):
a: Any
b: Any

[case testNamedtupleAltSyntaxUsingComma]
from collections import namedtuple, xx
X = namedtuple('X', 'a, b')
xx
[out]
from typing import Any, NamedTuple

class X(NamedTuple):
a: Any
b: Any

[case testNamedtupleAltSyntaxUsingMultipleCommas]
from collections import namedtuple, xx
X = namedtuple('X', 'a,, b')
xx
[out]
from typing import Any, NamedTuple

class X(NamedTuple):
a: Any
b: Any
Expand Down