[Python-checkins] cpython (merge default -> default): Merge heads.

[eric.smith]

http://hg.python.org/cpython/rev/6b8dd7724ec0
changeset:   75561:6b8dd7724ec0
parent:      75557:e04750e0ffd6
parent:      75560:0df295d590a8
user:        Eric V. Smith <eric at trueblade.com>
date:        Mon Mar 12 15:29:06 2012 -0700
summary:
  Merge heads.

files:
  Lib/test/test_unicode.py |  15 +++++++++------
  Misc/ACKS                |   1 +
  2 files changed, 10 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
--- 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})
diff --git a/Misc/ACKS b/Misc/ACKS
--- 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

-- 
Repository URL: http://hg.python.org/cpython