commit f2bb8898eac404301821c2d1cae9f9614d9bde29
author Eric V. Smith <eric@trueblade.com> Mon Mar 12 15:29:06 2012 -0700
committer Eric V. Smith <eric@trueblade.com> Mon Mar 12 15:29:06 2012 -0700
tree c256b17c3dca8071b5614aba77419fca4308f147
parent 56bac7b9e13cc77927383a5bf97f30c3211fc7a8
parent 97722c41320bd42d381027c4c95296352bcb44fa

Merge heads.

Lib/test/test_unicode.py

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

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index a0685c1..061df39 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -602,6 +602,7 @@
 Alain Leufroy
 Mark Levinson
 William Lewis
+Akira Li
 Xuanji Li
 Robert van Liere
 Ross Light