mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 15:06:09 +00:00
Code Issues 30 Releases Wiki Activity

Refs #28358 -- Fixed infinite recursion in LazyObject.__getattribute__().

Browse Source 
Regression in 97d7990abd.

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Co-authored-by: Theo Alexiou <theofilosalexiou@gmail.com>
This commit is contained in:
Matthias Kestenholz 2022-02-17 09:45:34 +01:00 committed by Mariusz Felisiak
parent a94ae4cb11
commit b2ed0d78f2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/functional.py
View File

@ -288,6 +288,9 @@ class LazyObject:
self._wrapped = empty self._wrapped = empty
def __getattribute__(self, name): def __getattribute__(self, name):
if name == "_wrapped":
# Avoid recursion when getting wrapped object.
return super().__getattribute__(name)
value = super().__getattribute__(name) value = super().__getattribute__(name)
# If attribute is a proxy method, raise an AttributeError to call # If attribute is a proxy method, raise an AttributeError to call
# __getattr__() and use the wrapped object method. # __getattr__() and use the wrapped object method.

8
tests/utils_tests/test_lazyobject.py
View File

@ -58,6 +58,14 @@ class LazyObjectTestCase(TestCase):
obj = self.lazy_wrap(Foo()) obj = self.lazy_wrap(Foo())
self.assertEqual(obj.foo, "bar") self.assertEqual(obj.foo, "bar")
def test_getattr_falsey(self):
class Thing:
def __getattr__(self, key):
return []
obj = self.lazy_wrap(Thing())
self.assertEqual(obj.main, [])
def test_setattr(self): def test_setattr(self):
obj = self.lazy_wrap(Foo()) obj = self.lazy_wrap(Foo())
obj.foo = "BAR" obj.foo = "BAR"