Automated merge with ssh://team@pocoo.org/jinja2-main

--HG-- branch : trunk
pallets · Jul 12, 2008 · 80b7895 · 80b7895
2 parents 76f9aa4 + 968ad5a
commit 80b7895
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jinja2/environment.py b/jinja2/environment.py
@@ -313,7 +313,7 @@ def getattr(self, obj, attribute):
             pass
         try:
             return obj[attribute]
-        except (TypeError, LookupError):
+        except (TypeError, LookupError, AttributeError):
             return self.undefined(obj=obj, name=attribute)
 
     def parse(self, source, name=None, filename=None):