str.format_map tests don't do what they say: fix to actually implement the intent...

author Eric V. Smith <eric@trueblade.com>

Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)

committer Eric V. Smith <eric@trueblade.com>

Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)
author Eric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)
committer Eric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)
diff --cc Lib/test/test_unicode.py
Simple merge
diff --cc Misc/ACKS

index a0685c1a0fabd20f9f45a599857448a3c7155027,e7bc2b6c8bfa6a7f3c72fc5b1659f4c15031ace5..061df39a39c6d450efe62806af6d42495c0339d8
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -599,9 -550,9 +599,10 @@@ Tshepang Lekhonkhob
   Marc-Andre Lemburg
   John Lenton
   Christopher Tur Lesniewski-Laas
+ +Alain Leufroy
   Mark Levinson
   William Lewis
+ Akira Li
   Xuanji Li
   Robert van Liere
   Ross Light
author	Eric V. Smith <eric@trueblade.com>
	Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)
committer	Eric V. Smith <eric@trueblade.com>
	Mon, 12 Mar 2012 22:26:21 +0000 (15:26 -0700)
		1	2
Lib/test/test_unicode.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history