Commit 4b0eab62 authored by Petri Lehtinen's avatar Petri Lehtinen

Merge branch 3.2

Closes #13402.
parents f854799d 9713321f
...@@ -202,8 +202,10 @@ always available. ...@@ -202,8 +202,10 @@ always available.
.. data:: executable .. data:: executable
A string giving the name of the executable binary for the Python interpreter, on A string giving the absolute path of the executable binary for the Python
systems where this makes sense. 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]) .. function:: exit([arg])
......
...@@ -542,6 +542,9 @@ class SysModuleTest(unittest.TestCase): ...@@ -542,6 +542,9 @@ class SysModuleTest(unittest.TestCase):
self.assertEqual(out, b'?') self.assertEqual(out, b'?')
def test_executable(self): 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] # 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 # has been set to an non existent program name and Python is unable to
# retrieve the real program name # retrieve the real program name
......
...@@ -2147,6 +2147,8 @@ C-API ...@@ -2147,6 +2147,8 @@ C-API
Documentation Documentation
------------- -------------
- Issue #13402: Document absoluteness of sys.executable.
- Issue #13883: PYTHONCASEOK also works on OS X. - Issue #13883: PYTHONCASEOK also works on OS X.
- Issue #12949: Document the kwonlyargcount argument for the PyCode_New - Issue #12949: Document the kwonlyargcount argument for the PyCode_New
......
...@@ -1257,7 +1257,7 @@ Static objects:\n\ ...@@ -1257,7 +1257,7 @@ Static objects:\n\
builtin_module_names -- tuple of module names built into this interpreter\n\ builtin_module_names -- tuple of module names built into this interpreter\n\
copyright -- copyright notice pertaining to this interpreter\n\ copyright -- copyright notice pertaining to this interpreter\n\
exec_prefix -- prefix used to find the machine-specific Python library\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_info -- a struct sequence with information about the float implementation.\n\
float_repr_style -- string indicating the style of repr() output for floats\n\ float_repr_style -- string indicating the style of repr() output for floats\n\
hexversion -- version information encoded as a single integer\n\ hexversion -- version information encoded as a single integer\n\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment