Merge with 3.3

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index da97dbc079b76bd0eb97abff7dc98af78c778530,4f90cae3a3bb15d3b6361f584978abebef0c2039..0c9e9ef5198055b92d1dfb46047638ea36b8bc42
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -563,73 -458,33 +563,78 @@@ Test
  - Issue #17692: test_sqlite now works with unittest test discovery.
    Patch by Zachary Ware.
  
 -- Issue #17843: Removed bz2 test data file that was triggering false-positive
 -  virus warnings with certain antivirus software.
 +- Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
 +
 +Documentation
 +-------------
 +
 +- Issue #17844: Add links to encoders and decoders for bytes-to-bytes codecs.
 +
 +- Issue #14097: improve the "introduction" page of the tutorial.
 +
 +- Issue #17977: The documentation for the cadefault argument's default value
 +  in urllib.request.urlopen() is fixed to match the code.
 +
 +- Issue #15940: Specify effect of locale on time functions.
 +
 +- Issue #6696: add documentation for the Profile objects, and improve
 +  profile/cProfile docs.  Patch by Tom Pinckney.
 +
 +C-API
 +-----
 +
 +- Issue #18351: Fix various issues in a function in importlib provided to help
 +  PyImport_ExecCodeModuleWithPathnames() (and thus by extension PyImport_ExecCodeModule() and PyImport_ExecCodeModuleEx()).
 +
 +- Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and
 +  PyObject_CallMethod() now changed to `const char*`.  Based on patches by
 +  Jörg Müller and Lars Buitinck.
 +
 +- Issue #17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now
 +  expand their arguments once instead of multiple times.  Patch written by Illia
 +  Polosukhin.
 +
 +- Issue #17522: Add the PyGILState_Check() API.
 +
 +- Issue #17327: Add PyDict_SetDefault.
 +
 +IDLE
 +----
 +
++- Issue #18279: Format - Strip trailing whitespace no longer marks a file as
++  changed when it has not been changed. This fix followed the addition of a
++  test file originally written by Phil Webster (the issue's main goal).
++
 +- Issue #7136: In the Idle File menu, "New Window" is renamed "New File".
 +  Patch by Tal Einat, Roget Serwy, and Todd Rovito.
 +
 +- Remove dead imports of imp.
 +
 +- Issue #18196: Avoid displaying spurious SystemExit tracebacks.
  
 -Documentation
 --------------
 +- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.
  
 -- Issue #15940: Specify effect of locale on time functions.
 +- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
 +  Original patch by Sarah K.
  
 -- Issue #6696: add documentation for the Profile objects, and improve
 -  profile/cProfile docs.  Patch by Tom Pinckney.
 +- Issue #18055: Move IDLE off of imp and on to importlib.
  
 -- Issue #17915: Fix interoperability of xml.sax with file objects returned by
 -  codecs.open().
 +- Issue #15392: Create a unittest framework for IDLE.
 +  Initial patch by Rajagopalasarma Jayakrishnan.
++  See Lib/idlelib/idle_test/README.txt for how to run Idle tests.
  
 -Build
 ------
 +- Issue #14146: Highlight source line while debugging on Windows.
  
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
 +- Issue #17838: Allow sys.stdin to be reassigned.
  
 -- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
  
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
 -*Release date: 07-Apr-2013*
 +- Issue #17532: Always include Options menu for IDLE on OS X.
 +  Patch by Guilherme Simões.
  
  Build
  -----