Launchpad itself

Merge lp:~jtv/launchpad/bug-637868 into lp:launchpad

  1. bug-637868
  2. Merge into devel
Proposed by Jeroen T. Vermeulen on 2010-09-14
Status: Merged
Approved by: Robert Collins on 2010-09-14
Approved revision: no longer in the source branch.
Merged at revision: 11545
Proposed branch: lp:~jtv/launchpad/bug-637868
Merge into: lp:launchpad
Diff against target: 13 lines (+2/-1)
1 file modified
lib/lp/translations/browser/potemplate.py (+2/-1)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-637868
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve on 2010-09-14
Launchpad code reviewers code 2010-09-14 Pending
Review via email: mp+35373@code.launchpad.net

Commit Message

Fix 2.6'ism in lp.translations.browser.potemplate.

Description of the Change

= Bug 637868 =

Fixes a python 2.6-ism that was breaking the Translations +templates pages on Hardy systems.

To test:
{{{
./bin/test -vvc lp.translations -t series-templates
}}}

Try this on Hardy, or it'll be too easy!

No lint.

Jeroen

To post a comment you must log in.
Robert Collins (lifeless) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/browser/potemplate.py'
2--- lib/lp/translations/browser/potemplate.py 2010-09-11 09:37:13 +0000
3+++ lib/lp/translations/browser/potemplate.py 2010-09-14 08:32:55 +0000
4@@ -968,7 +968,8 @@
5 ('actions_column', actions_header),
6 ]
7 return '\n'.join([
8- self._renderField(*column, tag='th') for column in columns])
9+ self._renderField(css, text, tag='th')
10+ for (css, text) in columns])
11
12 def renderTemplateRow(self, template):
13 """Render HTML for an entire template row."""