merge 3.3

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

diff --cc Misc/NEWS
index 716378aea140b68c66829832df66381709b8206d,14be9391d35d5c756e3debeb9328e8d111dd85a9..68902e5c1fe008d46c2533ecbe21a13af1278c28
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,39 -12,45 +10,42 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 -
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 -
 -Library
 --------
 -
 -- Issue #17981: Closed socket on error in SysLogHandler.
 -
 -- Fix typos in the multiprocessing module.
 +- Issue #12370: Prevent class bodies from interfering with the __class__
 +  closure.
 +
+ - Issue #17644: Fix a crash in str.format when curly braces are used in square
+   brackets.
+ 
 +- Issue #17237: Fix crash in the ASCII decoder on m68k.
  
 -- Issue #17754: Make ctypes.util.find_library() independent of the locale.
 +- Issue #17927: Frame objects kept arguments alive if they had been
 +  copied into a cell, even if the cell was cleared.
  
 -- Issue #17968: Fix memory leak in os.listxattr().
 +- Issue #1545463: At shutdown, defer finalization of codec modules so
 +  that stderr remains usable.
  
 -Documentation
 --------------
 +- Issue #7330: Implement width and precision (ex: "%5.3s") for the format
 +  string of PyUnicode_FromFormat() function, original patch written by Ysj Ray.
  
 -- Issue #17977: The documentation for the cadefault argument's default value
 -  in urllib.request.urlopen() is fixed to match the code.
 +- Issue #1545463: Global variables caught in reference cycles are now
 +  garbage-collected at shutdown.
  
 +- Issue #17094: Clear stale thread states after fork().  Note that this
 +  is a potentially disruptive change since it may release some system
 +  resources which would otherwise remain perpetually alive (e.g. database
 +  connections kept in thread-local storage).
  
 -What's New in Python 3.3.2?
 -===========================
 -
 -*Release date: 13-May-2013*
 +- Issue #17408: Avoid using an obsolete instance of the copyreg module when
 +  the interpreter is shutdown and then started again.
  
 -Core and Builtins
 ------------------
 +- Issue #5845: Enable tab-completion in the interactive interpreter by
 +  default, thanks to a new sys.__interactivehook__.
  
 -- Issue #17237: Fix crash in the ASCII decoder on m68k.
 +- Issue #17115,17116: Module initialization now includes setting __package__ and
 +  __loader__ attributes to None.
  
 -- Issue #17408: Avoid using an obsolete instance of the copyreg module when
 -  the interpreter is shutdown and then started again.
 +- Issue #17853: Ensure locals of a class that shadow free variables always win
 +  over the closures.
  
  - Issue #17863: In the interactive console, don't loop forever if the encoding
    can't be fetched from stdin.

diff --cc Objects/stringlib/unicode_format.h
Simple merge