From a68ea231012434b522ce45c513d84add516afa60 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Sun, 23 Dec 2018 04:11:24 +0500 Subject: Fixed #29970, #30041 -- Made ModelBase.__new__() pass attrs without contribute_to_class() to type.__new__(). --- tests/model_inheritance/tests.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py index 4e8e92a60c..5f89b4aa83 100644 --- a/tests/model_inheritance/tests.py +++ b/tests/model_inheritance/tests.py @@ -181,18 +181,33 @@ class ModelInheritanceTests(TestCase): def test_init_subclass(self): saved_kwargs = {} - class A: + class A(models.Model): def __init_subclass__(cls, **kwargs): super().__init_subclass__() saved_kwargs.update(kwargs) kwargs = {'x': 1, 'y': 2, 'z': 3} - class B(A, models.Model, **kwargs): + class B(A, **kwargs): pass self.assertEqual(saved_kwargs, kwargs) + @unittest.skipUnless(PY36, '__set_name__ is new in Python 3.6') + @isolate_apps('model_inheritance') + def test_set_name(self): + class ClassAttr: + called = None + + def __set_name__(self_, owner, name): + self.assertIsNone(self_.called) + self_.called = (owner, name) + + class A(models.Model): + attr = ClassAttr() + + self.assertEqual(A.attr.called, (A, 'attr')) + class ModelInheritanceDataTests(TestCase): @classmethod -- cgit v1.3