Commit 08b06f9c by Joshua Roesslein Committed by Chris Wanstrath

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

parent ae58a99f
...@@ -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 callable(attr):
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