Merge 3.2.1 release clone into main repo.

diff --cc Misc/NEWS
index 1440035f32f5a0c2f53952fa45bacea737abf9a4,cd4fac9e143193eccf5084d15681d13767256035..9a46b72742a6f31c9e6ab1d5e71c2d46de4d8628
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -5,7 -5,7 +5,7 @@@ Python New
  What's New in Python 3.2.2?
  ===========================
  
- *Release date: XX-XX-2011*
 -*Release date: XXXX-XX-XX*
++*Release date: XX-XXX-2011*
  
  Core and Builtins
  -----------------
@@@ -21,61 -13,6 +21,51 @@@
  Library
  -------
  
- - Issue #12467: warnings: fix a race condition if a warning is emitted at
-   shutdown, if globals()['__file__'] is None.
- 
 +- Issue #12493: subprocess: Popen.communicate() now also handles EINTR errors
 +  if the process has only one pipe.
 +
- - Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
-   failure in name resolution.
- 
 +- Issue #12451: pydoc: html_getfile() now uses tokenize.open() to support
 +  Python scripts using a encoding different than UTF-8 (read the coding cookie
 +  of the script).
 +
 +- Issue #12451: pydoc: importfile() now opens the Python script in binary mode,
 +  instead of text mode using the locale encoding, to avoid encoding issues.
 +
 +- Issue #12451: runpy: run_path() now opens the Python script in binary mode,
 +  instead of text mode using the locale encoding, to support other encodings
 +  than UTF-8 (scripts using the coding cookie).
 +
 +- Issue #12451: xml.dom.pulldom: parse() now opens files in binary mode instead
 +  of the text mode (using the locale encoding) to avoid encoding issues.
 +
 +C-API
 +-----
 +
 +Tests
 +-----
 +
- - Avoid failing in test_urllibnet.test_bad_address when some overzealous
-   DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
-   is now skipped instead.
- 
 +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
 +  an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
 +  Web site.
 +
 +- Issue #12440: When testing whether some bits in SSLContext.options can be
 +  reset, check the version of the OpenSSL headers Python was compiled against,
 +  rather than the runtime version of the OpenSSL library.
 +
 +- Issue #12497: Install test/data to prevent failures of the various codecmaps
 +  tests.
 +
 +- Issue #12496: Install test/capath directory to prevent test_connect_capath
 +  testcase failure in test_ssl.
 +
 +- Issue #12469: Run "wakeup" signal tests in subprocess to run the test in a
 +  fresh process with only one thread and to not change signal handling of the
 +  parent process.
 +
 +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run
 +  test_tk or test_ttk_guionly under a username that is not currently logged
 +  in to the console windowserver (as may be the case under buildbot or ssh).
 +
  
  What's New in Python 3.2.1?
  ===========================