commit edbb6ca084b4446dcf6c78c942e875a3b16a4397
author Eric V. Smith <eric@trueblade.com> Mon Mar 12 15:16:22 2012 -0700
committer Eric V. Smith <eric@trueblade.com> Mon Mar 12 15:16:22 2012 -0700
tree ebbfc79afc9843b33c56cf1c42db95a28fd420b9
parent a7fccd8b14885a76525e11baa1f9db7792d9a26c

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

Lib/test/test_unicode.py

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 259a181..19b06a0 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -891,12 +891,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 0028877..e7bc2b6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -552,6 +552,7 @@
 Christopher Tur Lesniewski-Laas
 Mark Levinson
 William Lewis
+Akira Li
 Xuanji Li
 Robert van Liere
 Ross Light