Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge heads.

This commit is contained in:
Eric V. Smith 2012-03-12 15:29:06 -07:00
parent 56bac7b9e1 97722c4132
commit f2bb8898ea
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_unicode.py
View File

@ -957,12 +957,15 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual('{foo._x}'.format_map({'foo': C(20)}), '20') self.assertEqual('{foo._x}'.format_map({'foo': C(20)}), '20')
# test various errors # test various errors
self.assertRaises(TypeError, '{'.format_map) self.assertRaises(TypeError, ''.format_map)
self.assertRaises(TypeError, '}'.format_map) self.assertRaises(TypeError, 'a'.format_map)
self.assertRaises(TypeError, 'a{'.format_map)
self.assertRaises(TypeError, 'a}'.format_map) self.assertRaises(ValueError, '{'.format_map, {})
self.assertRaises(TypeError, '{a'.format_map) self.assertRaises(ValueError, '}'.format_map, {})
self.assertRaises(TypeError, '}a'.format_map) self.assertRaises(ValueError, 'a{'.format_map, {})
self.assertRaises(ValueError, 'a}'.format_map, {})
self.assertRaises(ValueError, '{a'.format_map, {})
self.assertRaises(ValueError, '}a'.format_map, {})
# issue #12579: can't supply positional params to format_map # issue #12579: can't supply positional params to format_map
self.assertRaises(ValueError, '{}'.format_map, {'a' : 2}) self.assertRaises(ValueError, '{}'.format_map, {'a' : 2})

1
Misc/ACKS
View File

@ -602,6 +602,7 @@ Christopher Tur Lesniewski-Laas
Alain Leufroy Alain Leufroy
Mark Levinson Mark Levinson
William Lewis William Lewis
Akira Li
Xuanji Li Xuanji Li
Robert van Liere Robert van Liere
Ross Light Ross Light