Issue #9154: Merge fix from 3.2.

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

diff --cc Misc/NEWS
index fbc8b5f2537abb978717e929754b9765a79c8a4c,ebf0cfacaed3eb864b639ff6e96ec220e03d3f9c..b907f8c490229e2cd2b61ba8ba595d80ce8aba81
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,21 -33,30 +81,23 @@@ Core and Builtin
  - Issue #13019: Fix potential reference leaks in bytearray.extend().  Patch
    by Suman Saha.
  
 -- Issue #14378: Fix compiling ast.ImportFrom nodes with a "__future__" string as
 -  the module name that was not interned.
 -
 -- Issue #14331: Use significantly less stack space when importing modules by
 -  allocating path buffers on the heap instead of the stack.
 -
 -- Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
 -  passed strings.
 -
 -- Issue #1469629: Allow cycles through an object's __dict__ slot to be
 -  collected. (For example if ``x.__dict__ is x``).
 +Library
 +-------
  
 -- Issue #14172: Fix reference leak when marshalling a buffer-like object
 -  (other than a bytes object).
++- Issue #9154: Fix parser module to understand function annotations.
+ 
 -- Issue #13521: dict.setdefault() now does only one lookup for the given key,
 -  making it "atomic" for many purposes.  Patch by Filip Gruszczyński.
 +- Issue #6085: In http.server.py SimpleHTTPServer.address_string returns the
 +  client ip address instead client hostname. Patch by Charles-François Natali.
  
 -- Issue #14471: Fix a possible buffer overrun in the winreg module.
 +- Issue #14309: Deprecate time.clock(), use time.perf_counter() or
 +  time.process_time() instead.
  
 -Library
 --------
 +- Issue #14428: Implement the PEP 418. Add time.get_clock_info(),
 +  time.perf_counter() and time.process_time() functions, and rename
 +  time.steady() to time.monotonic().
  
 -- Issue #9154: Fix parser module to understand function annotations.
 +- Issue #14646: importlib.util.module_for_loader() now sets __loader__ and
 +  __package__ (when possible).
  
  - Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a
    test class that doesn't inherit from TestCase (i.e. a mixin).

diff --cc Modules/parsermodule.c
Simple merge