Merge lp:~barry/update-manager/673297-py27 into lp:update-manager

Proposed by Barry Warsaw on 2010-11-10
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~barry/update-manager/673297-py27
Merge into: lp:update-manager
Diff against target: 32 lines (+10/-2)
2 files modified
UpdateManager/Core/utils.py (+2/-2)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~barry/update-manager/673297-py27
Reviewer Review Type Date Requested Status
Michael Vogt 2010-11-10 Approve on 2010-11-10
Review via email: mp+40510@code.launchpad.net

Description of the change

From the changelog:

 * In Python 2.7, locale.format() input test has gotten more strict. It
   does not allow trailing text after the format string. Change this to
   locale.format_string(). See Python issue 10379. (LP: #673297)

To post a comment you must log in.
Barry Warsaw (barry) wrote :

With this change, and no-change rebuilds for gnome-python, python-apt, and dbus-python, Update Manager will work with Python 2.7 on Natty.

Michael Vogt (mvo) wrote :

Thanks! That looks fine. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/Core/utils.py'
2--- UpdateManager/Core/utils.py 2010-08-12 09:54:02 +0000
3+++ UpdateManager/Core/utils.py 2010-11-10 10:04:04 +0000
4@@ -349,10 +349,10 @@
5 return _("1 KB")
6 elif bytes < 1024 * 1024:
7 # TRANSLATORS: download size of small updates, e.g. "250 KB"
8- return locale.format(_("%.0f KB"), bytes/1024)
9+ return locale.format_string(_("%.0f KB"), bytes/1024)
10 else:
11 # TRANSLATORS: download size of updates, e.g. "2.3 MB"
12- return locale.format(_("%.1f MB"), bytes / 1024 / 1024)
13+ return locale.format_string(_("%.1f MB"), bytes / 1024 / 1024)
14
15 if __name__ == "__main__":
16 #print mirror_from_sources_list()
17
18=== modified file 'debian/changelog'
19--- debian/changelog 2010-11-04 22:54:45 +0000
20+++ debian/changelog 2010-11-10 10:04:04 +0000
21@@ -1,3 +1,11 @@
22+update-manager (1:0.145.2) UNRELEASED; urgency=low
23+
24+ * In Python 2.7, locale.format() input test has gotten more strict. It
25+ does not allow trailing text after the format string. Change this to
26+ locale.format_string(). See Python issue 10379. (LP: #673297)
27+
28+ -- Barry Warsaw <barry@ubuntu.com> Tue, 09 Nov 2010 22:01:28 -0500
29+
30 update-manager (1:0.145.1) UNRELEASED; urgency=low
31
32 * DistUpgrade/EOLReleaseAnnouncement:

Subscribers

People subscribed via source and target branches

to status/vote changes: