Mercurial > genshi > mirror
changeset 428:dcba5b97b420 trunk
Simplify undefined error message.
| author | cmlenz |
|---|---|
| date | Thu, 22 Mar 2007 16:59:54 +0000 |
| parents | 55c574767df2 |
| children | 691dd56c0dd0 |
| files | genshi/template/eval.py genshi/template/plugin.py genshi/template/tests/eval.py |
| diffstat | 3 files changed, 4 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/template/eval.py +++ b/genshi/template/eval.py @@ -215,12 +215,7 @@ """ def __init__(self, name, owner=UNDEFINED): if owner is not UNDEFINED: - orepr = repr(owner) - if len(orepr) > 60: - orepr = orepr[:60] + '...' - message = '%s (%s) has no member named "%s"' % ( - type(owner).__name__, orepr, name - ) + message = '%s has no member named "%s"' % (repr(owner), name) else: message = '"%s" not defined' % name TemplateRuntimeError.__init__(self, message)
--- a/genshi/template/plugin.py +++ b/genshi/template/plugin.py @@ -96,17 +96,7 @@ """Render the output to an event stream.""" if not isinstance(template, Template): template = self.load_template(template) - ctxt = Context(**info) - - # Some functions for Kid compatibility - def defined(name): - return name in ctxt - ctxt['defined'] = defined - def value_of(name, default=None): - return ctxt.get(name, default) - ctxt['value_of'] = value_of - - return template.generate(ctxt) + return template.generate(**info) class MarkupTemplateEnginePlugin(AbstractTemplateEnginePlugin):
--- a/genshi/template/tests/eval.py +++ b/genshi/template/tests/eval.py @@ -353,8 +353,7 @@ while frame.tb_next: frame = frame.tb_next frames.append(frame) - self.assertEqual('Something (<Something>) has no member named "nil"', - str(e)) + self.assertEqual('<Something> has no member named "nil"', str(e)) self.assertEqual("<Expression 'something.nil'>", frames[-2].tb_frame.f_code.co_name) self.assertEqual('index.html', @@ -376,8 +375,7 @@ while frame.tb_next: frame = frame.tb_next frames.append(frame) - self.assertEqual('Something (<Something>) has no member named "nil"', - str(e)) + self.assertEqual('<Something> has no member named "nil"', str(e)) self.assertEqual('''<Expression 'something["nil"]'>''', frames[-2].tb_frame.f_code.co_name) self.assertEqual('index.html',