Merge branch '2.11.x'

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/test_api.py b/tests/test_api.py
index 0655c47..2679e8f 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -267,6 +267,21 @@ class TestUndefined:
         with pytest.raises(AttributeError):
             Undefined("Foo").__dict__
 
+    def test_undefined_attribute_error(self):
+        # Django's LazyObject turns the __class__ attribute into a
+        # property that resolves the wrapped function. If that wrapped
+        # function raises an AttributeError, printing the repr of the
+        # object in the undefined message would cause a RecursionError.
+        class Error:
+            @property
+            def __class__(self):
+                raise AttributeError()
+
+        u = Undefined(obj=Error(), name="hello")
+
+        with pytest.raises(UndefinedError):
+            getattr(u, "recursion", None)
+
     def test_logging_undefined(self):
         _messages = []