Merge lp:~salgado/launchpad/breadcrumb-change-fallout into lp:~launchpad-committers/launchpad/python-migration

Proposed by Guilherme Salgado
Status: Superseded
Proposed branch: lp:~salgado/launchpad/breadcrumb-change-fallout
Merge into: lp:~launchpad-committers/launchpad/python-migration
Diff against target: 13 lines
1 file modified
lib/canonical/launchpad/webapp/breadcrumb.py (+3/-1)
To merge this branch: bzr merge lp:~salgado/launchpad/breadcrumb-change-fallout
Reviewer Review Type Date Requested Status
Michael Nelson Pending
Review via email: mp+13410@code.launchpad.net

This proposal has been superseded by a proposal from 2009-10-15.

To post a comment you must log in.
Revision history for this message
Guilherme Salgado (salgado) wrote :

Yesterday I changed Breadcrumb.__repr__() to fix some tests, but that change broke a different test. This branch fixes it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/webapp/breadcrumb.py'
2--- lib/canonical/launchpad/webapp/breadcrumb.py 2009-10-14 20:36:08 +0000
3+++ lib/canonical/launchpad/webapp/breadcrumb.py 2009-10-15 12:52:11 +0000
4@@ -57,7 +57,9 @@
5 # XXX: salgado, 2009-10-14, http://bugs.python.org/issue5876: In
6 # python 2.5, the return value of __repr__() may be forced into a
7 # type(str), so we can't include unicode here.
8- text = self.text.encode('raw-unicode-escape')
9+ text = self.text
10+ if text is not None:
11+ text = text.encode('raw-unicode-escape')
12 return "<%s url='%s' text='%s'>" % (
13 self.__class__.__name__, self.url, text)
14

Subscribers

People subscribed via source and target branches