p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25910 -- Rejected read-only property names in model constructors.

This commit is contained in:
Joshua Phillips 2016-01-21 16:49:40 +00:00 committed by Tim Graham
parent 4dc74371e3
commit 16baec5c8a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/base.py
View File

@ -435,7 +435,8 @@ class Model(six.with_metaclass(ModelBase)):
for prop in list(kwargs): for prop in list(kwargs):
try: try:
if isinstance(getattr(self.__class__, prop), property): if isinstance(getattr(self.__class__, prop), property):
setattr(self, prop, kwargs.pop(prop)) setattr(self, prop, kwargs[prop])
del kwargs[prop]
except AttributeError: except AttributeError:
pass pass
if kwargs: if kwargs:

4
tests/properties/tests.py
View File

@ -18,6 +18,10 @@ class PropertyTests(TestCase):
# The "full_name" property hasn't provided a "set" method. # The "full_name" property hasn't provided a "set" method.
self.assertRaises(AttributeError, setattr, self.a, 'full_name', 'Paul McCartney') self.assertRaises(AttributeError, setattr, self.a, 'full_name', 'Paul McCartney')
# And cannot be used to initialize the class.
with self.assertRaisesMessage(TypeError, "'full_name' is an invalid keyword argument"):
Person(full_name='Paul McCartney')
# But "full_name_2" has, and it can be used to initialize the class. # But "full_name_2" has, and it can be used to initialize the class.
a2 = Person(full_name_2='Paul McCartney') a2 = Person(full_name_2='Paul McCartney')
a2.save() a2.save()