str.format_map tests don't do what they say: fix to actually implement the intent of the test. Closes #13450. Patch by Akira Li.

This commit is contained in:
Eric V. Smith 2012-03-12 15:26:21 -07:00
commit 97722c4132
2 changed files with 10 additions and 6 deletions

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

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