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

[Barry Warsaw]

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)

[Barry Warsaw (barry)]

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)]

Thanks! That looks fine. Merged.

review: Approve

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2010-08-12 09:54:02 +0000
+++ UpdateManager/Core/utils.py	2010-11-10 10:04:04 +0000
@@ -349,10 +349,10 @@
         return _("1 KB")
     elif bytes < 1024 * 1024:
         # TRANSLATORS: download size of small updates, e.g. "250 KB"
-        return locale.format(_("%.0f KB"), bytes/1024)
+        return locale.format_string(_("%.0f KB"), bytes/1024)
     else:
         # TRANSLATORS: download size of updates, e.g. "2.3 MB"
-        return locale.format(_("%.1f MB"), bytes / 1024 / 1024)
+        return locale.format_string(_("%.1f MB"), bytes / 1024 / 1024)
 
 if __name__ == "__main__":
   #print mirror_from_sources_list()
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-11-04 22:54:45 +0000
+++ debian/changelog	2010-11-10 10:04:04 +0000
@@ -1,3 +1,11 @@
+update-manager (1:0.145.2) UNRELEASED; urgency=low
+
+  * 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)
+
+ -- Barry Warsaw <[e-mail]>  Tue, 09 Nov 2010 22:01:28 -0500
+
 update-manager (1:0.145.1) UNRELEASED; urgency=low
 
   * DistUpgrade/EOLReleaseAnnouncement: