Recorded merge of revisions 81205 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81205 | victor.stinner | 2010-05-15 23:00:59 +0200 (sam., 15 mai 2010) | 2 lines

  NEWS: strip trailing spaces
........

1 files changed, 12 insertions, 12 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index 3923149..386e9e0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -389,9 +389,9 @@ Library
 
 - Issue #8573: asyncore _strerror() function might throw ValueError.
 
-- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing 
-  error messages when accessing undefined class attributes because of the cheap 
-  inheritance with the underlying socket object. 
+- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing
+  error messages when accessing undefined class attributes because of the cheap
+  inheritance with the underlying socket object.
   The cheap inheritance has been deprecated.
 
 - Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills.
@@ -488,7 +488,7 @@ Library
 
 - Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree.
 
-- Issue #1540112: Now allowing the choice of a copy function in 
+- Issue #1540112: Now allowing the choice of a copy function in
   shutil.copytree.
 
 - Issue #4814: timeout parameter is now applied also for connections resulting
@@ -803,7 +803,7 @@ Library
   Initial patch by Brian Curtin.
 
 - Issue #7556: Make sure Distutils' msvc9compile reads and writes the
-  MSVC XML Manifest file in text mode so string patterns can be used 
+  MSVC XML Manifest file in text mode so string patterns can be used
   in regular expressions.
 
 - Issue #7552: Removed line feed in the base64 Authorization header in
@@ -834,13 +834,13 @@ Library
 - Issue #6986: Fix crash in the JSON C accelerator when called with the
   wrong parameter types.  Patch by Victor Stinner.
 
-- Issue #7457: added a read_pkg_file method to 
+- Issue #7457: added a read_pkg_file method to
   distutils.dist.DistributionMetadata.
 
 - logging: Added optional `secure` parameter to SMTPHandler, to enable use of
   TLS with authentication credentials.
 
-- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is 
+- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is
   generated in Distutils. Patch by Stephen Emslie.
 
 - Issue #4120: Drop reference to CRT from manifest when building extensions with
@@ -878,7 +878,7 @@ Library
 - Issue #6123: tarfile now opens empty archives correctly and consistently
   raises ReadError on empty files.
 
-- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can 
+- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can
   be 2.
 
 - Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead
@@ -916,12 +916,12 @@ Library
 - Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass``
   argument added to the TextTestRunner constructor allowing a different result
   class to be used without having to subclass.
-  
+
 - Issue 7588: ``unittest.TextTestResult.getDescription`` now includes the test
   name in failure reports even if the test has a docstring.
 
 - Issue #3001: Add a C implementation of recursive locks which is used by
-  default when instantiating a `threading.RLock` object. This makes 
+  default when instantiating a `threading.RLock` object. This makes
   recursive locks as fast as regular non-recursive locks (previously,
   they were slower by 10x to 15x).
 
@@ -1367,7 +1367,7 @@ Tests
 - Issue #7498: test_multiprocessing now uses test.support.find_unused_port
   instead of a hardcoded port number in test_rapid_restart.
 
-- Issue #7431: use TESTFN in test_linecache instead of trying to create a 
+- Issue #7431: use TESTFN in test_linecache instead of trying to create a
   file in the Lib/test directory, which might be read-only for the
   user running the tests.
 
@@ -2251,7 +2251,7 @@ Library
 - Issue #7071: byte-compilation in Distutils is now done with respect to
   sys.dont_write_bytecode.
 
-- Issue #7066: archive_util.make_archive now restores the cwd if an error is 
+- Issue #7066: archive_util.make_archive now restores the cwd if an error is
   raised. Initial patch by Ezio Melotti.
 
 - Issue #6516: Added owner/group support when creating tar archives in