Software Properties

Merge lp:~evfool/software-properties/lp1081279 into lp:software-properties

  1. lp1081279
  2. Merge into main
Proposed by Robert Roth
Status: Merged
Merged at revision: 829
Proposed branch: lp:~evfool/software-properties/lp1081279
Merge into: lp:software-properties
Diff against target: 12 lines (+1/-1)
1 file modified
softwareproperties/gtk/DialogAdd.py (+1/-1)
To merge this branch: bzr merge lp:~evfool/software-properties/lp1081279
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+148196@code.launchpad.net

Commit message

- Do not encode the example source URL to avoid adding the 'b' prefix (bug #1081279)

Description of the change

- Do not encode the example source URL to avoid adding the 'b' prefix (bug #1081279)

This branch removes an encode('UTF-8') from the Add Source Dialog code, encoding the example source url.

Leaving the encode adds the b prefix (as encode is converting to bytes) thus causing bug #1081279.
The encode has been added as the fix for bug #721778, however with python 3 that should be irrelevant, tested the same usecase as the bug has been reported as reproducible with, aka mixing UTF-8 and non-UTF-8 locales, and the dialog opens just fine.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/gtk/DialogAdd.py'
2--- softwareproperties/gtk/DialogAdd.py 2011-08-17 05:19:00 +0000
3+++ softwareproperties/gtk/DialogAdd.py 2013-02-13 14:09:53 +0000
4@@ -58,7 +58,7 @@
5 example = "deb http://ftp.debian.org sarge main"
6 # L10N: the example is of the format: deb http://ftp.debian.org sarge main
7 msg = _("The APT line includes the type, location and components of a "
8- "repository, for example '%s'.") % ("<i>%s</i>" % example).encode('UTF-8')
9+ "repository, for example '%s'.") % ("<i>%s</i>" % example)
10 self.label_example_line.set_label(msg)
11
12 def run(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: