(original) (raw)

changeset: 91284:fd9f7bdd7472 parent: 91281:590ad80784bf parent: 91283:1727dcfff233 user: Senthil Kumaran senthil@uthcode.com date: Fri Jun 20 01:38:37 2014 -0700 description: merge from 3.4 issue 20091 - index entry for __main__ in runpy docs. diff -r 590ad80784bf -r fd9f7bdd7472 Doc/library/runpy.rst --- a/Doc/library/runpy.rst Fri Jun 20 00:55:10 2014 +0300 +++ b/Doc/library/runpy.rst Fri Jun 20 01:38:37 2014 -0700 @@ -28,6 +28,9 @@ .. 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 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 @@ -87,6 +90,9 @@ .. 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 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 /senthil@uthcode.com