8000 Support additional args to namedtuple() by JelleZijlstra · Pull Request #5215 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Support additional args to namedtuple() #5215

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
merged 11 commits into from
Aug 3, 2018
Merged

Support additional args to namedtuple() #5215

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d394c6e
add tests
JelleZijlstra Jun 14, 2018
c73583d
support additional args to namedtuple
JelleZijlstra Jun 14, 2018
ec25ae9
fix test; remove unnecessary fixture
JelleZijlstra Jun 14, 2018
b02b21e
support 3.7 defaults
JelleZijlstra Jun 14, 2018
4613aa3
remove function I didn't need
JelleZijlstra Jun 14, 2018
6c9a8b5
fix long line
JelleZijlstra Jun 14, 2018
e977b71
remove redundant argument
JelleZijlstra Jun 14, 2018
4c47a0a
fix error in self-check
JelleZijlstra Jun 14, 2018
138b2fd
respond to code review
JelleZijlstra Aug 3, 2018
ebc66d2
pass the actual defaults
JelleZijlstra Aug 3, 2018
ff63b1b
fix CI; remove obsolete comment
JelleZijlstra Aug 3, 2018
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
Prev Previous commit
fix CI; remove obsolete comment
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Aug 3, 2018
commit ff63b1ba24e2d1c1c4bac176e9440ea91c650210
20 changes: 9 additions & 11 deletions mypy/semanal_namedtuple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,6 @@ def check_namedtuple(self,
name += '@' + str(call.line)
if len(defaults) > 0:
default_items = {
# We don't have the actual argument expressions any more, so we
# just use Ellipsis for all defaults.
arg_name: default
for arg_name, default in zip(items[-len(defaults):], defaults)
}
Expand All @@ -174,8 +172,8 @@ def check_namedtuple(self,
call.analyzed.set_line(call.line, call.column)
return info

def parse_namedtuple_args(self, call: CallExpr,
fullname: str) -> Tuple[List[str], List[Type], List[Expression], bool]:
def parse_namedtuple_args(self, call: CallExpr, fullname: str
) -> Tuple[List[str], List[Type], List[Expression], bool]:
"""Parse a namedtuple() call into data needed to construct a type.

Returns a 4-tuple:
Expand Down Expand Up @@ -246,9 +244,9 @@ def parse_namedtuple_args(self, call: CallExpr,
defaults = defaults[:len(items)]
return items, types, defaults, ok

def parse_namedtuple_fields_with_types(
self, nodes: List[Expression], context: Context
) -> Tuple[List[str], List[Type], int, bool]:
def parse_namedtuple_fields_with_types(self, nodes: List[Expression], context: Context
) -> Tuple[List[str], List[Type], List[Expression],
bool]:
items = [] # type: List[str]
types = [] # type: List[Type]
for item in nodes:
Expand All @@ -268,12 +266,12 @@ def parse_namedtuple_fields_with_types(
types.append(self.api.anal_type(type))
else:
return self.fail_namedtuple_arg("Tuple expected as NamedTuple() field", item)
return items, types, 0, True
return items, types, [], True

def fail_namedtuple_arg(self, message: str,
context: Context) -> Tuple[List[str], List[Type], int, bool]:
def fail_namedtuple_arg(self, message: str, context: Context
) -> Tuple[List[str], List[Type], List[Expression], bool]:
self.fail(message, context)
return [], [], 0, False
return [], [], [], False

def build_namedtuple_typeinfo(self, name: str, items: List[str], types: List[Type],
default_items: Mapping[str, Expression]) -> TypeInfo:
Expand Down
0