diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-11-27 01:24:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-11-27 01:24:01 (GMT) |
| commit | d75803c1fcab18eca7859c212ca594137dd75e25 (patch) | |
| tree | de4e78c5a8e00ecafc71cda7f7bc7e41a12286c3 | |
| parent | 14fff88773a1a01441654c0fc45d323801e5dbe8 (diff) | |
| parent | 0ee22bf7743dc9a6d593c432f787d7bfe70be199 (diff) | |
| download | cpython-d75803c1fcab18eca7859c212ca594137dd75e25.zip cpython-d75803c1fcab18eca7859c212ca594137dd75e25.tar.gz cpython-d75803c1fcab18eca7859c212ca594137dd75e25.tar.bz2 | |
merge 3.3 (#19729)
| -rw-r--r-- | Lib/test/test_unicode.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 07f76a8..575c4a5 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -973,6 +973,8 @@ class UnicodeTest(string_tests.CommonTest, 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') @@ -10,6 +10,8 @@ Release date: 2014-01-05 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. |