https://github.com/python/cpython/commit/d063ad8962a83f41fccdca774b728c38266... commit: d063ad8962a83f41fccdca774b728c3826639f62 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> committer: Ivan Levkivskyi <levkivskyi@gmail.com> date: 2018-04-01T12:33:13+01:00 summary: Allow dynamic creation of generic dataclasses (GH-6319) (GH-6320) (cherry picked from commit 5a7092de1226a95a50f0f384eea8ddb288959249) Co-authored-by: Ivan Levkivskyi <levkivskyi@gmail.com> files: M Lib/dataclasses.py M Lib/test/test_dataclasses.py diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py index bd7252c683ca..04e07f8cf8c2 100644 --- a/Lib/dataclasses.py +++ b/Lib/dataclasses.py @@ -1004,7 +1004,9 @@ class C(Base): anns[name] = tp namespace['__annotations__'] = anns - cls = type(cls_name, bases, namespace) + # We use `types.new_class()` instead of simply `type()` to allow dynamic creation + # of generic dataclassses. + cls = types.new_class(cls_name, bases, {}, lambda ns: ns.update(namespace)) return dataclass(cls, init=init, repr=repr, eq=eq, order=order, unsafe_hash=unsafe_hash, frozen=frozen) diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index 5cd424cf5760..26bfc4e75a00 100755 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -8,7 +8,7 @@ import inspect import unittest from unittest.mock import Mock -from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar +from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar, Optional from collections import deque, OrderedDict, namedtuple from functools import total_ordering @@ -1690,6 +1690,23 @@ def new_method(self): c = Alias(10, 1.0) self.assertEqual(c.new_method(), 1.0) + def test_generic_dynamic(self): + T = TypeVar('T') + + @dataclass + class Parent(Generic[T]): + x: T + Child = make_dataclass('Child', [('y', T), ('z', Optional[T], None)], + bases=(Parent[int], Generic[T]), namespace={'other': 42}) + self.assertIs(Child[int](1, 2).z, None) + self.assertEqual(Child[int](1, 2, 3).z, 3) + self.assertEqual(Child[int](1, 2, 3).other, 42) + # Check that type aliases work correctly. + Alias = Child[T] + self.assertEqual(Alias[int](1, 2).x, 1) + # Check MRO resolution. + self.assertEqual(Child.__mro__, (Child, Parent, Generic, object)) + def test_helper_replace(self): @dataclass(frozen=True) class C: