8000 bpo-43923: Revert "bpo-40185: Refactor typing.NamedTuple (GH-19371)" by juliusgeo · Pull Request #31679 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43923: Revert "bpo-40185: Refactor typing.NamedTuple (GH-19371)" #31679

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

Closed
wants to merge 3 commits into from
Closed

bpo-43923: Revert "bpo-40185: Refactor typing.NamedTuple (GH-19371)" #31679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f1573
Revert "bpo-40185: Refactor typing.NamedTuple (GH-19371)"
juliusgeo Mar 4, 2022
28039c7
revert changes to test_typing.py
juliusgeo Mar 7, 2022
c44efc2
fix frozenset changes
juliusgeo Mar 7, 2022
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
Next Next commit
Revert "bpo-40185: Refactor typing.NamedTuple (GH-19371)" 
This reverts commit a2ec069.
  • Loading branch information
@juliusgeo
juliusgeo committed Mar 4, 2022
commit 03f1573fbc7449d67ad6ded0b3aeb83d78ef0b20
28 changes: 17 additions & 11 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4441,9 +4441,11 @@ def test_annotation_usage_with_default(self):
self.assertEqual(CoolEmployeeWithDefault._field_defaults, dict(cool=0))

with self.assertRaises(TypeError):
class NonDefaultAfterDefault(NamedTuple):
x: int = 3
y: int
exec("""
class NonDefaultAfterDefault(NamedTuple):
x: int = 3
y: int
""")

def test_annotation_usage_with_methods(self):
self.assertEqual(XMeth(1).double(), 2)
Expand All @@ -4452,16 +4454,20 @@ def test_annotation_usage_with_methods(self):
self.assertEqual(XRepr(1, 2) + XRepr(3), 0)

with self.assertRaises(AttributeError):
class XMethBad(NamedTuple):
x: int
def _fields(self):
return 'no chance for this'
exec("""
class XMethBad(NamedTuple):
x: int
def _fields(self):
return 'no chance for this'
""")

with self.assertRaises(AttributeError):
class XMethBad2(NamedTuple):
x: int
def _source(self):
return 'no chance for this as well'
exec("""
class XMethBad2(NamedTuple):
x: int
def _source(self):
return 'no chance for this as well'
""")

def test_multiple_inheritance(self):
class A:
Expand Down
81 changes: 42 additions & 39 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,41 +2396,51 @@ def __round__(self, ndigits: int = 0) -> T_co:
pass


def _make_nmtuple(name, types, module, defaults = ()):
fields = [n for n, t in types]
types = {n: _type_check(t, f"field {n} annotation must be a type")
for n, t in types}
nm_tpl = collections.namedtuple(name, fields,
defaults=defaults, module=module)
nm_tpl.__annotations__ = nm_tpl.__new__.__annotations__ = types
def _make_nmtuple(name, types):
msg = "NamedTuple('Name', [(f0, t0), (f1, t1), ...]); each t must be a type"
types = [(n, _type_check(t, msg)) for n, t in types]
nm_tpl = collections.namedtuple(name, [n for n, t in types])
nm_tpl.__annotations__ = dict(types)
try:
nm_tpl.__module__ = sys._getframe(2).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
return nm_tpl


# attributes prohibited to set in NamedTuple class syntax
_prohibited = frozenset({'__new__', '__init__', '__slots__', '__getnewargs__',
'_fields', '_field_defaults',
'_make', '_replace', '_asdict', '_source'})
_prohibited = {'__new__', '__init__', '__slots__', '__getnewargs__',
'_fields', '_field_defaults',
'_make', '_replace', '_asdict', '_source'}

_special = frozenset({'__module__', '__name__', '__annotations__'})
_special = {'__module__', '__name__', '__annotations__'}


class NamedTupleMeta(type):

def __new__(cls, typename, bases, ns):
assert bases[0] is _NamedTuple
if ns.get('_root', False):
return super().__new__(cls, typename, bases, ns)
if len(bases) > 1:
raise TypeError("Multiple inheritance with NamedTuple is not supported")
assert bases[0] is NamedTuple
types = ns.get('__annotations__', {})
default_names = []
nm_tpl = _make_nmtuple(typename, types.items())
defaults = []
defaults_dict = {}
for field_name in types:
if field_name in ns:
default_names.append(field_name)
elif default_names:
raise TypeError(f"Non-default namedtuple field {field_name} "
f"cannot follow default field"
f"{'s' if len(default_names) > 1 else ''} "
f"{', '.join(default_names)}")
nm_tpl = _make_nmtuple(typename, types.items(),
defaults=[ns[n] for n in default_names],
module=ns['__module__'])
default_value = ns[field_name]
defaults.append(default_value)
defaults_dict[field_name] = default_value
elif defaults:
raise TypeError("Non-default namedtuple field {field_name} cannot "
"follow default field(s) {default_names}"
.format(field_name=field_name,
default_names=', '.join(defaults_dict.keys())))
nm_tpl.__new__.__annotations__ = dict(types)
nm_tpl.__new__.__defaults__ = tuple(defaults)
nm_tpl._field_defaults = defaults_dict
# update from user namespace without overriding special namedtuple attributes
for key in ns:
if key in _prohibited:
Expand All @@ -2440,7 +2450,7 @@ def __new__(cls, typename, bases, ns):
return nm_tpl


def NamedTuple(typename, fields=None, /, **kwargs):
class NamedTuple(metaclass=NamedTupleMeta):
"""Typed version of namedtuple.

Usage in Python versions >= 3.6::
Expand All @@ -2464,22 +2474,15 @@ class Employee(NamedTuple):

Employee = NamedTuple('Employee', [('name', str), ('id', int)])
"""
if fields is None:
fields = kwargs.items()
elif kwargs:
raise TypeError("Either list of fields or keywords"
" can be provided to NamedTuple, not both")
return _make_nmtuple(typename, fields, module=_caller())

_NamedTuple = type.__new__(NamedTupleMeta, 'NamedTuple', (), {})

def _namedtuple_mro_entries(bases):
if len(bases) > 1:
raise TypeError("Multiple inheritance with NamedTuple is not supported")
assert bases[0] is NamedTuple
return (_NamedTuple,)

NamedTuple.__mro_entries__ = _namedtuple_mro_entries
_root = True

def __new__(cls, typename, fields=None, /, **kwargs):
if fields is None:
fields = kwargs.items()
elif kwargs:
raise TypeError("Either list of fields or keywords"
" can be provided to NamedTuple, not both")
return _make_nmtuple(typename, fields)


class _TypedDictMeta(type):
Expand Down
0