Fixed #27140 -- Prevented template rendering from hiding a property's TypeError.

1 files changed, 2 insertions, 3 deletions

diff --git a/django/template/base.py b/django/template/base.py
index d97ee81326..778d82be55 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -892,9 +892,8 @@ class Variable(object):
                             raise AttributeError
                         current = getattr(current, bit)
                     except (TypeError, AttributeError) as e:
-                        # Reraise an AttributeError raised by a @property
-                        if (isinstance(e, AttributeError) and
-                                not isinstance(current, BaseContext) and bit in dir(current)):
+                        # Reraise if the exception was raised by a @property
+                        if not isinstance(current, BaseContext) and bit in dir(current):
                             raise
                         try:  # list-index lookup
                             current = current[int(bit)]