Merge fix for #11490 from 3.1.

diff --cc Lib/test/test_subprocess.py
index 4b58308497976def800adf5c08f9248e683996d4,d7db802576c351467f0abc0b96f1857e5ee1fc58..f1b49d5ac539311745c850ec9f8e115bd619aae6
--- 1/Lib/test/test_subprocess.py
--- 2/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@@ -587,8 -552,11 +587,9 @@@ class ProcessTestCase(BaseTestCase)
                  subprocess.Popen(['nonexisting_i_hope'],
                                   stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)
-             if c.exception.errno != errno.ENOENT:  # ignore "no such file"
 -            # Windows raises IOError
 -            except (IOError, OSError) as err:
 -                # ignore errors that indicate the command was not found
 -                if err.errno not in (errno.ENOENT, errno.EACCES): 
 -                    raise
++            # ignore errors that indicate the command was not found
++            if c.exception.errno not in (errno.ENOENT, errno.EACCES): 
 +                raise c.exception
  
      def test_issue8780(self):
          # Ensure that stdout is inherited from the parent

diff --cc Misc/NEWS
index 37b64250d7865ff1439341baea8c369163756a99,2b099783dbaf0ab8d0e5ffe9d890efa9ba3e0814..f3bc9921e94beb40a29bdfc4ddc417ab9a41f669
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -70,142 -60,23 +70,145 @@@ Librar
    4GB, even on 32-bit builds.  Initial patch by Ross Lagerwall, adapted for
    32-bit Windows.
  
 -- email.header.Header was incorrectly encoding folding white space when
 -  rfc2047-encoding header values with embedded newlines, leaving them
 -  without folding whitespace.  It now uses the continuation_ws, as it
 -  does for continuation lines that it creates itself.
 +- Issue #11089: Fix performance issue limiting the use of ConfigParser()
 +  with large config files.
 +
 +- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
 +  larger than 4GB.  Patch by Nadeem Vawda.
  
 -- Issue #10360: In WeakSet, do not raise TypeErrors when testing for
 -  membership of non-weakrefable objects.
 +Build
 +-----
  
 -- Issue #10549: Fix pydoc traceback when text-documenting certain classes.
 +- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
  
 -- Issue #11110: Fix _sqlite to not deref a NULL when module creation fails.
 +- Issue #11268: Prevent Mac OS X Installer failure if Documentation
 +  package had previously been installed.
  
 -- Issue #11089: Fix performance issue limiting the use of ConfigParser()
 -  with large config files.
 +Tools/Demos
 +-----------
 +
 +- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
 +
 +Tests
 +-----
 +
++- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
++  false positive if the last directory in the path is inaccessible.
++
 +- Issue #11223: Fix test_threadsignals to fail, not hang, when the
 +  non-semaphore implementation of locks is used under POSIX.
 +
 +- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by
 +  Pierre Quentel.
 +
 +- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions.
 +  Patch by Hirokazu Yamamoto.
 +
 +- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due
 +  to open door files.
 +
 +
 +What's New in Python 3.2?
 +=========================
 +
 +*Release date: 20-Feb-2011*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #11249: Fix potential crashes when using the limited API.
 +
 +Build
 +-----
 +
 +- Issue #11222: Fix non-framework shared library build on Mac OS X.
 +
 +- Issue #11184: Fix large-file support on AIX.
 +
 +- Issue #941346: Fix broken shared library build on AIX.
 +
 +Documentation
 +-------------
 +
 +- Issue #10709: Add updated AIX notes in Misc/README.AIX.
 +
 +
 +What's New in Python 3.2 Release Candidate 3?
 +=============================================
 +
 +*Release date: 13-Feb-2011*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #11134: Add missing fields to typeslots.h.
 +
 +- Issue #11135: Remove redundant doc field from PyType_Spec.
 +
 +- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited
 +  ABI.
 +
 +- Issue #11118: Fix bogus export of None in python3.dll.
 +
 +Library
 +-------
 +
 +- Issue #11116: any error during addition of a message to a mailbox now causes a
 +  rollback, instead of leaving the mailbox partially modified.
 +
 +- Issue #11132: Fix passing of "optimize" parameter when recursing in
 +  compileall.compile_dir().
 +
 +- Issue #11110: Fix a potential decref of a NULL in sqlite3.
 +
 +- Issue #8275: Fix passing of callback arguments with ctypes under Win64.  Patch
 +  by Stan Mihai.
 +
 +Build
 +-----
 +
 +- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X
 +  installers now includes a link to the installed documentation and no longer
 +  includes an Extras directory.  The Tools directory is now installed in the
 +  framework under share/doc.
 +
 +- Issue #11121: Fix building with --enable-shared.
 +
 +Tests
 +-----
 +
 +- Issue #10971: test_zipimport_support is once again compatible with the refleak
 +  hunter feature of test.regrtest.
 +
 +
 +What's New in Python 3.2 Release Candidate 2?
 +=============================================
  
 -- Issue #8275: Fix passing of callback arguments with ctypes under Win64.
 -  Patch by Stan Mihai.
 +*Release date: 30-Jan-2011*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #10451: memoryview objects could allow to mutate a readable buffer.
 +  Initial patch by Ross Lagerwall.
 +
 +Library
 +-------
 +
 +- Issue #9124: mailbox now accepts binary input and reads and writes mailbox
 +  files in binary mode, using the email package's binary support to parse
 +  arbitrary email messages.  StringIO and text file input is deprecated,
 +  and string input fails early if non-ASCII characters are used, where
 +  previously it would fail when the email was processed in a later step.
 +
 +- Issue #10845: Mitigate the incompatibility between the multiprocessing
 +  module on Windows and the use of package, zipfile or directory execution
 +  by special casing main modules that actually *are* called __main__.py.
 +
 +- Issue #11045: Protect logging call against None argument.
 +
 +- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save
 +  commands.
  
  - Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x,
    preventing a confusing hung appearance on OS X with the windows