Commit 828b0017 by Joshua Roesslein Committed by Chris Wanstrath

Avoid try/block for detecting callable attributes. Allow for callable context attributes.

parent 6e83a2e3
...@@ -76,15 +76,12 @@ class View(object): ...@@ -76,15 +76,12 @@ class View(object):
return re.sub('[A-Z]', repl, name)[1:] return re.sub('[A-Z]', repl, name)[1:]
def get(self, attr, default): def get(self, attr, default):
if attr in self.context: attr = self.context.get(attr, getattr(self, attr, default))
return self.context[attr]
elif hasattr(self, attr): if hasattr(attr, '__call__'):
try: return attr()
return getattr(self, attr)()
except TypeError:
return getattr(self, attr)
else: else:
return default return attr
def render(self): def render(self):
template = self.load_template() template = self.load_template()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment