Revert "Better way to perform callable check. Allow callables from context attributes."

This reverts commit 08b06f9cabffe7750511250526e73205cbe82c40.

1 files changed, 8 insertions, 5 deletions

diff --git a/pystache/view.py b/pystache/view.py
index 5c2fc10..a7a7de2 100644
--- a/pystache/view.py
+++ b/pystache/view.py
@@ -76,12 +76,15 @@ class View(object):
         return re.sub('[A-Z]', repl, name)[1:]
 
     def get(self, attr, default):
-        attr = self.context.get(attr, getattr(self, attr, default))
-
-        if callable(attr):
-            return attr()
+        if attr in self.context:
+            return self.context[attr]
+        elif hasattr(self, attr):
+            try:
+                return getattr(self, attr)()
+            except TypeError:
+                return getattr(self, attr)
         else:
-            return attr
+            return default
 
     def render(self):
         template = self.load_template()