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/environment.py

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 41b0ce7..e10510c 100644
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -280,9 +280,14 @@
         """Get an item or attribute of an object."""
         if isinstance(argument, basestring):
             try:
-                return getattr(obj, str(argument))
-            except (AttributeError, UnicodeError):
+                attr = str(argument)
+            except:
                 pass
+            else:
+                try:
+                    return getattr(obj, attr)
+                except AttributeError:
+                    pass
         try:
             return obj[argument]
         except (TypeError, LookupError):