Merge from 3.2.

diff --cc Lib/test/test_unicode.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index a456bf36c5612e65e976391de148716ff4755d69,f444709ab50a1b710d88d96b58a1fb22b800d521..7632292e8dd4f07309af36603bb614087fbd7c55
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,10 +10,12 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #12579: str.format_map() now raises a ValueError if used on a
+   format string that contains positional fields. Initial patch by
+   Julian Berman.
+ 
 +- Issue #10271: Allow warnings.showwarning() be any callable.
 +
  - Issue #11627: Fix segfault when __new__ on a exception returns a non-exception
    class.