Merge 3.2

diff --cc Lib/platform.py
Simple merge

diff --cc Misc/NEWS
index 5a25f58736b61e2c483eb2278bd655da4d16ad83,e1356add4720f418b52c6c1d191e3ff9e2280405..a9be99dd2ceff972396299aca9ac16ab2a9fed19
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -41,17 -129,45 +41,19 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #16114: The subprocess module no longer provides a misleading
 -  error message stating that args[0] did not exist when either the cwd or
 -  executable keyword arguments specified a path that did not exist.
 -
 -- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
 -  return a returncode of 0 when the child has already exited or cannot
 -  be waited on.
 -
 -- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
 -
 -- Issue #15222: Insert blank line after each message in mbox mailboxes
 -
 -- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
 -  Patch by Serhiy Storchaka.
 -
 -- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
 -  datetime.MAXYEAR.  Patch by Cédric Krier.
+ - Issue #16176: Properly identify Windows 8 via platform.platform()
+ 
 +- Issue #16114: The subprocess module no longer provides a misleading error
 +  message stating that args[0] did not exist when either the cwd or executable
 +  keyword arguments specified a path that did not exist.
  
 -- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
 -  elements 'meta' and 'param'.
 -
 -- Issue #15842: the SocketIO.{readable,writable,seekable} methods now
 -  raise ValueError when the file-like object is closed.  Patch by Alessandro
 -  Moura.
 -
 -- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
 -  by Chris McDonough.
 -
 -- Issue #15340: Fix importing the random module when /dev/urandom cannot
 -  be opened.  This was a regression caused by the hash randomization patch.
 +- Issue #16169: Fix ctypes.WinError()'s confusion between errno and winerror.
  
 -- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
 -  and StringIO objects now raise ValueError when the object has been closed.
 -  Patch by Alessandro Moura.
 +- Issue #16089: Allow ElementTree.TreeBuilder to work again with a non-Element
 +  element_factory (fixes a regression in SimpleTAL).
  
 -- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
 -  Popen when %action substitutions produce empty strings.
 +- Issue #16034: Fix performance regressions in the new `bz2.BZ2File`
 +  implementation.  Initial patch by Serhiy Storchaka.
  
  - Issue #16112: platform.architecture does not correctly escape argument to
    /usr/bin/file.  Patch by David Benjamin.