summaryrefslogtreecommitdiff
path: root/Lib/test/test_unicode.py
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-03-13 00:14:59 -0700
committerSenthil Kumaran <senthil@uthcode.com>2012-03-13 00:14:59 -0700
commit784ddb08a692a531d35e48c44bd7d84592ffb32a (patch)
tree6162ff8bdf913cf64adc06094f1c8bee8b1d6606 /Lib/test/test_unicode.py
parent6080db76066a83fc7c2e50975b616f649fbfb2d6 (diff)
parentdf723e1e5e4e0022a28618f953219aaf52852643 (diff)
downloadcpython-git-784ddb08a692a531d35e48c44bd7d84592ffb32a.tar.gz
merge heads
Diffstat (limited to 'Lib/test/test_unicode.py')
-rw-r--r--Lib/test/test_unicode.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 259a181b3b..19b06a034d 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -891,12 +891,15 @@ class UnicodeTest(string_tests.CommonTest,
self.assertEqual('{foo._x}'.format_map({'foo': C(20)}), '20')
# test various errors
- 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(TypeError, '}a'.format_map)
+ self.assertRaises(TypeError, ''.format_map)
+ self.assertRaises(TypeError, 'a'.format_map)
+
+ self.assertRaises(ValueError, '{'.format_map, {})
+ self.assertRaises(ValueError, '}'.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
self.assertRaises(ValueError, '{}'.format_map, {'a' : 2})