merge 3.2 (#12732)

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

diff --cc Misc/NEWS
index 34aac7941d7cc5080a39cc1a47cb2f808935c73a,354d09a070c10cbbdd2fade41f78ba83e6d5592c..360e7312715ca527c9cc1d67c8e1875d38376af9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,12 -10,14 +10,15 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #11603: Fix a crash when __str__ is rebound as __repr__.  Patch by
 -  Andreas Stührk.
+ - Issue #12732: In narrow unicode builds, allow Unicode identifiers which fall
+   outside the BMP.
+ 
 +- Issue #12575: Validate user-generated AST before it is compiled.
  
 -- Issue #11321: Fix a crash with multiple imports of the _pickle module when
 -  embedding Python.  Patch by Andreas Stührk.
 +- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They
 +  return the respective singleton instances.
 +
 +- Forbid summing bytes in sum().
  
  - Verify the types of AST strings and identifiers provided by the user before
    compiling them.

diff --cc Objects/unicodeobject.c
Simple merge