Merged revisions 63402,63405,63411,63457,63467-63468,63480,63507-63508,63516,63534,63541 via svnmerge from

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

........
  r63402 | raymond.hettinger | 2008-05-16 23:13:36 -0500 (Fri, 16 May 2008) | 1 line

  Fix-up docstring
........
  r63405 | gregory.p.smith | 2008-05-17 02:17:34 -0500 (Sat, 17 May 2008) | 3 lines

  fix issue2381: test_subprocess fails if your sys.executable is on a
  path with a space in it.
........
  r63411 | lars.gustaebel | 2008-05-17 11:50:22 -0500 (Sat, 17 May 2008) | 8 lines

  Replace signatures with optional arguments in square brackets with
  keyword arguments and the actual default values.
  Fix references that point nowhere or to the wrong place.
  Add description of the ENCODING module-level variable.
  Fix the URL pointing to the GNU tar manual.
  Remove two obsolete examples.
  Add an example on how to use a generator with TarFile.extractall().
........
  r63457 | ronald.oussoren | 2008-05-18 15:09:54 -0500 (Sun, 18 May 2008) | 9 lines

  MacOSX: ctypes annotation in implementation of getproxies_macosx_sysconf

  getproxies_macosx_sysconf uses ctypes to call SystemConfiguration APIs. This
  checkin adds ctypes annotation to specify the right argument types for the
  API's that are used.

  This is needed to be able to use urllib on a 64-bit system, without
  annotations you'd get a hard crash.
........
  r63467 | andrew.kuchling | 2008-05-18 22:03:46 -0500 (Sun, 18 May 2008) | 1 line

  Re-organize the increasingly long list of deprecated modules
........
  r63468 | benjamin.peterson | 2008-05-19 06:55:54 -0500 (Mon, 19 May 2008) | 2 lines

  just MacOS (instead of MacOS 9)
........
  r63480 | neal.norwitz | 2008-05-20 00:21:57 -0500 (Tue, 20 May 2008) | 1 line

  Add html package so it gets installed and more tests work (from installed copy)
........
  r63507 | vinay.sajip | 2008-05-20 10:34:36 -0500 (Tue, 20 May 2008) | 1 line

  Fixed: #2914 (RFE for UTC support in TimedRotatingFileHandler) and #2929 (wrong filename used to delete old log files).
........
  r63508 | vinay.sajip | 2008-05-20 10:37:22 -0500 (Tue, 20 May 2008) | 1 line

  Updated with fixes for #2914 and #2929.
........
  r63516 | martin.v.loewis | 2008-05-21 02:31:31 -0500 (Wed, 21 May 2008) | 2 lines

  Add Robert Schuppenies.
........
  r63534 | brett.cannon | 2008-05-21 22:18:35 -0500 (Wed, 21 May 2008) | 1 line

  Add Quentin Gallet-Gilles for (at least) a fixer for markupbase.
........
  r63541 | raymond.hettinger | 2008-05-22 19:49:27 -0500 (Thu, 22 May 2008) | 1 line

  Docs for Issue 2819.
........

1 files changed, 2 insertions, 2 deletions

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 5a325ce..3f877f2 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -534,7 +534,7 @@ class ProcessTestCase(unittest.TestCase):
             # args is a string
             f, fname = self.mkstemp()
             os.write(f, "#!/bin/sh\n")
-            os.write(f, "exec %s -c 'import sys; sys.exit(47)'\n" %
+            os.write(f, "exec '%s' -c 'import sys; sys.exit(47)'\n" %
                         sys.executable)
             os.close(f)
             os.chmod(fname, 0o700)
@@ -576,7 +576,7 @@ class ProcessTestCase(unittest.TestCase):
             # call() function with string argument on UNIX
             f, fname = self.mkstemp()
             os.write(f, "#!/bin/sh\n")
-            os.write(f, "exec %s -c 'import sys; sys.exit(47)'\n" %
+            os.write(f, "exec '%s' -c 'import sys; sys.exit(47)'\n" %
                         sys.executable)
             os.close(f)
             os.chmod(fname, 0o700)