Mercurial > bitten > bitten-test
changeset 488:9b3d97297201
Fix compatibility problem with Genshi trunk.
| author | cmlenz |
|---|---|
| date | Sun, 27 Apr 2008 22:58:24 +0000 |
| parents | fbd5bc3c2a48 |
| children | 417b2fd694df |
| files | bitten/web_ui.py |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/web_ui.py +++ b/bitten/web_ui.py @@ -85,8 +85,8 @@ if not req.perm.has_permission('BUILD_VIEW'): return yield ('mainnav', 'build', \ - Markup('<a href="%s" accesskey="5">Build Status</a>', - req.href.build())) + Markup('<a href="%s" accesskey="5">Build Status</a>') % + req.href.build()) # ITemplatesProvider methods @@ -451,8 +451,9 @@ errors += [(step.name, error) for error in step.errors] - title = Markup('Build of <em>%s [%s]</em> on %s %s', label, rev, - platform, _status_label[status]) + title = Markup('Build of <em>%s [%s]</em> on %s %s') % ( + label, rev, platform, _status_label[status] + ) message = '' if req.args.get('format') == 'rss': href = req.abs_href.build(config, id) @@ -476,7 +477,7 @@ for step, error in errors: if step not in steps: steps.append(step) - steps = [Markup('<em>%s</em>', step) for step in steps] + steps = [Markup('<em>%s</em>') % step for step in steps] if len(steps) < 2: message = steps[0] elif len(steps) == 2: @@ -484,8 +485,9 @@ elif len(steps) > 2: message = Markup(', ').join(steps[:-1]) + ', and ' + \ steps[-1] - message = Markup('Step%s %s failed', - len(steps) != 1 and 's' or '', message) + message = Markup('Step%s %s failed') % ( + len(steps) != 1 and 's' or '', message + ) yield event_kinds[status], href, title, stopped, None, message # Internal methods