merge from 3.4

issue 20091 - index entry for __main__ in runpy docs.
This commit is contained in:
Senthil Kumaran 2014-06-20 01:38:37 -07:00
commit 2b31375956
1 changed files with 6 additions and 0 deletions

View File

@ -28,6 +28,9 @@ The :mod:`runpy` module provides two functions:
.. function:: run_module(mod_name, init_globals=None, run_name=None, alter_sys=False) .. function:: run_module(mod_name, init_globals=None, run_name=None, alter_sys=False)
.. index::
module: __main__
Execute the code of the specified module and return the resulting module Execute the code of the specified module and return the resulting module
globals dictionary. The module's code is first located using the standard globals dictionary. The module's code is first located using the standard
import mechanism (refer to :pep:`302` for details) and then executed in a import mechanism (refer to :pep:`302` for details) and then executed in a
@ -87,6 +90,9 @@ The :mod:`runpy` module provides two functions:
.. function:: run_path(file_path, init_globals=None, run_name=None) .. function:: run_path(file_path, init_globals=None, run_name=None)
.. index::
module: __main__
Execute the code at the named filesystem location and return the resulting Execute the code at the named filesystem location and return the resulting
module globals dictionary. As with a script name supplied to the CPython module globals dictionary. As with a script name supplied to the CPython
command line, the supplied path may refer to a Python source file, a command line, the supplied path may refer to a Python source file, a