Merged revisions 80521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80521 | r.david.murray | 2010-04-26 22:45:53 -0400 (Mon, 26 Apr 2010) | 13 lines

  Merged revisions 80512 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80512 | r.david.murray | 2010-04-26 17:17:14 -0400 (Mon, 26 Apr 2010) | 7 lines

    Issue #6656: fix locale.format_string to handle escaped percents and mappings.

    Refactors format_string.  Includes tests for the two problems noted in
    the issue, but as far as I can see there are no other tests that confirm
    that format_string conforms to normal % formatting rules.
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index 2ff4ff4..dcec2e9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -105,6 +105,9 @@
 Library
 -------
 
+- Issue #6656: fix locale.format_string to handle escaped percents
+  and mappings.
+
 - Issue #1100562: Fix deep-copying of objects derived from the list and
   dict types.  Patch by Michele Orrù and Björn Lindqvist.