Issue #12885: Merge with 3.5

diff --cc Misc/NEWS
index b5cb9e85018fa73e5ef1100fe2ceabe54f4e28c4,823074597fec8e6e209414fe25ccfdb623f8c3e6..be46c6b40709d6bc1bc2f98f3c4dfee497a6c722
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -57,20 -26,31 +57,20 @@@ Core and Builtin
    In a brand new thread, raise a RuntimeError since there is no active
    exception to reraise. Patch written by Xiang Zhang.
  
 -- Issue #27419: Standard __import__() no longer look up "__import__" in globals
 -  or builtins for importing submodules or "from import".  Fixed handling an
 -  error of non-string package name.
 -
 -- Issue #27083: Respect the PYTHONCASEOK environment variable under Windows.
 -
 -- Issue #27514: Make having too many statically nested blocks a SyntaxError
 -  instead of SystemError.
 -
 -- Issue #27473: Fixed possible integer overflow in bytes and bytearray
 -  concatenations.  Patch by Xiang Zhang.
 -
 -- Issue #27507: Add integer overflow check in bytearray.extend().  Patch by
 -  Xiang Zhang.
 +Library
 +-------
  
 -- Issue #27581: Don't rely on wrapping for overflow check in
 -  PySequence_Tuple().  Patch by Xiang Zhang.
 +- Issue #27919: Deprecated ``extra_path`` distribution option in distutils
 +  packaging.
  
 -- Issue #27443: __length_hint__() of bytearray iterators no longer return a
 -  negative integer for a resized bytearray.
 +- Issue #23229: Add new ``cmath`` constants: ``cmath.inf`` and ``cmath.nan`` to
 +  match ``math.inf`` and ``math.nan``, and also ``cmath.infj`` and
 +  ``cmath.nanj`` to match the format used by complex repr.
  
 -Library
 --------
 +- Issue #27842: The csv.DictReader now returns rows of type OrderedDict.
 +  (Contributed by Steve Holden.)
  
- - Issue #12285: Fix error when distutils encounters symlink.
+ - Issue #12885: Fix error when distutils encounters symlink.
  
  - Issue #27881: Fixed possible bugs when setting sqlite3.Connection.isolation_level.
    Based on patch by Xiang Zhang.