Issue #14697: Merge fix from 3.2.

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

diff --cc Misc/NEWS
index a7350beb8e007a8d8d4ada294d55822e2260a0f6,3da5cc09bc96d7eece25c14fa26129a9d597d362..4904a2179d3ff17beb54494bdb65a5798497c85a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,51 -2,10 +2,54 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.2.4
 -==========================
 +What's New in Python 3.3.0 Alpha 4?
 +===================================
  
 -*Release date: XX-XX-XXXX*
 +*Release date: XX-XXX-2012*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #14700: Fix two broken and undefined-behaviour-inducing overflow checks
 +  in old-style string formatting.
 +
 +- Issue #14705: The PyArg_Parse() family of functions now support the 'p' format
 +  unit, which accepts a "boolean predicate" argument.  It converts any Python
 +  value into an integer--0 if it is "false", and 1 otherwise.
 +
 +Library
 +-------
 +
++- Issue #14697: Fix missing support for set displays and set comprehensions in
++  parser module.
++
 +- Issue #14701: Fix missing support for 'raise ... from' in parser module.
 +
 +- Add support for timeouts to the acquire() methods of
 +  multiprocessing's lock/semaphore/condition proxies.
 +
 +- Issue #13989: Add support for text mode to gzip.open().
 +
 +- Issue #14127: The os.stat() result object now provides three additional
 +  fields: st_ctime_ns, st_mtime_ns, and st_atime_ns, providing those times as an
 +  integer with nanosecond resolution.  The functions os.utime(), os.lutimes(),
 +  and os.futimes() now accept a new parameter, ns, which accepts mtime and atime
 +  as integers with nanosecond resolution.
 +
 +- Issue #14127 and #10148: shutil.copystat now preserves exact mtime and atime
 +  on filesystems providing nanosecond resolution.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #14695: Bring Tools/parser/unparse.py support up to date with
 +  the Python 3.3 Grammar.
 +
 +
 +What's New in Python 3.3.0 Alpha 3?
 +===================================
 +
 +*Release date: 01-May-2012*
  
  Core and Builtins
  -----------------

diff --cc Modules/parsermodule.c
Simple merge