Skip to content

New backward-compatible NamedTuple #282

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
gvanrossum merged 7 commits into from
Sep 11, 2016
Merged

New backward-compatible NamedTuple #282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e191fb
New backward-compatible NamedTuple
ilevkivskyi Sep 11, 2016
e2dad0f
Minor refactoring
ilevkivskyi Sep 11, 2016
6e4525d
Fixed for older Python 3 versions
ilevkivskyi Sep 11, 2016
6352eae
Fixed typo
ilevkivskyi Sep 11, 2016
ce6aa0d
Fixed unordered dict
ilevkivskyi Sep 11, 2016
170408d
Fixed one more typo
ilevkivskyi Sep 11, 2016
11b6940
Fixed one more typo
ilevkivskyi Sep 11, 2016
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
Next Next commit
Minor refactoring
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Sep 11, 2016
commit e2dad0f689742a2784d8c5f0596f21a6d38ca671
1 change: 1 addition & 0 deletions src/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,7 @@ class CSub(B):
z: ClassVar['CSub'] = B()
class G(Generic[T]):
lst: ClassVar[List[T]] = []

class CoolEmployee(NamedTuple):
name: str
cool: int
Expand Down
32 changes: 15 additions & 17 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,19 +1801,23 @@ def new_user(user_class: Type[U]) -> U:
"""


def _make_nmtuple(name, types):
nm_tpl = collections.namedtuple(name, [n for n in types])
nm_tpl._field_types = types
try:
nm_tpl.__module__ = sys._getframe(2).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
return nm_tpl


class NamedTupleMeta(type):

def __new__(cls, name, bases, ns, *, _root=False):
def __new__(cls, typename, bases, ns, *, _root=False):
if _root:
return super().__new__(cls, name, bases, ns)
return super().__new__(cls, typename, bases, ns)
types = ns.get('__annotations__', {})
nm_tpl = collections.namedtuple(name, [n for n in types])
nm_tpl._field_types = types
try:
nm_tpl.__module__ = sys._getframe(1).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
return nm_tpl
return _make_nmtuple(typename, types)


class NamedTuple(metaclass=NamedTupleMeta, _root=True):
Expand All @@ -1838,14 +1842,8 @@ class Employee(NamedTuple):
"""

def __new__(self, typename, fields):
cls = collections.namedtuple(typename, [n for n, t in fields])
cls._field_types = dict(fields)
# Set the module to the caller's module (otherwise it'd be 'typing').
try:
cls.__module__ = sys._getframe(1).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
return cls
types = dict(fields)
return _make_nmtuple(typename, types)


def NewType(name, tp):
Expand Down