commit ab5ad8ca248b5ebbcb82209ab31e2f387d2b9e92
author Armin Ronacher <armin.ronacher@active-4.com> Sat May 17 00:34:11 2008 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Sat May 17 00:34:11 2008 +0200
tree 6c831f7098257eaa51d20f4b93096ed512e02762
parent 67fdddf4f26a0c0420c3002f097a36f038971feb

subscribe doesn't eat up unicode errors any longer

--HG--
branch : trunk

jinja2/sandbox.py

diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py
index c041a06..714a0e1 100644
--- a/jinja2/sandbox.py
+++ b/jinja2/sandbox.py
@@ -120,13 +120,18 @@
         is_unsafe = False
         if isinstance(argument, basestring):
             try:
-                value = getattr(obj, str(argument))
-            except (AttributeError, UnicodeError):
+                attr = str(argument)
+            except:
                 pass
             else:
-                if self.is_safe_attribute(obj, argument, value):
-                    return value
-                is_unsafe = True
+                try:
+                    value = getattr(obj, attr)
+                except AttributeError:
+                    pass
+                else:
+                    if self.is_safe_attribute(obj, argument, value):
+                        return value
+                    is_unsafe = True
         try:
             return obj[argument]
         except (TypeError, LookupError):