Merge branch 3.2

Closes #13402.
This commit is contained in:
Petri Lehtinen 2012-02-02 21:23:15 +02:00
commit 4b0eab62f0
4 changed files with 10 additions and 3 deletions

View File

@ -202,8 +202,10 @@ always available.
.. data:: executable
A string giving the name of the executable binary for the Python interpreter, on
systems where this makes sense.
A string giving the absolute path of the executable binary for the Python
interpreter, on systems where this makes sense. If Python is unable to retrieve
the real path to its executable, :data:`sys.executable` will be an empty string
or ``None``.
.. function:: exit([arg])

View File

@ -542,6 +542,9 @@ class SysModuleTest(unittest.TestCase):
self.assertEqual(out, b'?')
def test_executable(self):
# sys.executable should be absolute
self.assertEqual(os.path.abspath(sys.executable), sys.executable)
# Issue #7774: Ensure that sys.executable is an empty string if argv[0]
# has been set to an non existent program name and Python is unable to
# retrieve the real program name

View File

@ -2147,6 +2147,8 @@ C-API
Documentation
-------------
- Issue #13402: Document absoluteness of sys.executable.
- Issue #13883: PYTHONCASEOK also works on OS X.
- Issue #12949: Document the kwonlyargcount argument for the PyCode_New

View File

@ -1257,7 +1257,7 @@ Static objects:\n\
builtin_module_names -- tuple of module names built into this interpreter\n\
copyright -- copyright notice pertaining to this interpreter\n\
exec_prefix -- prefix used to find the machine-specific Python library\n\
executable -- pathname of this Python interpreter\n\
executable -- absolute path of the executable binary of the Python interpreter\n\
float_info -- a struct sequence with information about the float implementation.\n\
float_repr_style -- string indicating the style of repr() output for floats\n\
hexversion -- version information encoded as a single integer\n\