summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_unicode.py
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-03-13 07:14:25 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-03-13 07:14:25 (GMT)
commit7554f0dd3ca6219db07adcc222cef776d37512a6 (patch)
tree9139b775096275084284e8b2cf459c81818ffc58 /Lib/test/test_unicode.py
parent9186850088a94627b60fa80102edc858c332b51c (diff)
parenta9719057a2ee1875c6334b1d5fbbf66cfc02ca78 (diff)
downloadcpython-7554f0dd3ca6219db07adcc222cef776d37512a6.zip
cpython-7554f0dd3ca6219db07adcc222cef776d37512a6.tar.gz
cpython-7554f0dd3ca6219db07adcc222cef776d37512a6.tar.bz2
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 33d7b35..813d59f 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -957,12 +957,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})