[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19729)

[benjamin.peterson]

http://hg.python.org/cpython/rev/e27684eed3b6
changeset:   87606:e27684eed3b6
parent:      87604:2c1e041cb504
parent:      87605:bab7dc2ffc16
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Nov 26 19:24:01 2013 -0600
summary:
  merge 3.3 (#19729)

files:
  Lib/test/test_unicode.py |  2 ++
  Misc/NEWS                |  2 ++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -973,6 +973,8 @@
         self.assertRaises(ValueError, "{a{b}".format, 42)
         self.assertRaises(ValueError, "{[}".format, 42)
 
+        self.assertEqual("0x{:0{:d}X}".format(0x0,16), "0x0000000000000000")
+
     def test_format_map(self):
         self.assertEqual(''.format_map({}), '')
         self.assertEqual('a'.format_map({}), 'a')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #19729: In str.format(), fix recursive expansion in format spec.
+
 - Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2
   billion characters) input strings in _Py_dg_strtod.
 

-- 
Repository URL: http://hg.python.org/cpython