summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-12-10 06:47:06 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-12-10 06:47:06 (GMT)
commit7dda421bfff887da9a84e99c37ef1b0ef9f3cde9 (patch)
treee39c07f91360571424cb92263f3f34434c974ec4 /Doc
parenta29eb08fb97fff461b62682da4ee9ac6ea8db5bf (diff)
downloadcpython-7dda421bfff887da9a84e99c37ef1b0ef9f3cde9.zip
cpython-7dda421bfff887da9a84e99c37ef1b0ef9f3cde9.tar.gz
cpython-7dda421bfff887da9a84e99c37ef1b0ef9f3cde9.tar.bz2
Issue #14285: Do not catch exceptions initializing any ancestor package
The previous fix only handled the case of the parent package of __main__ failing to initialize. Also make the "Error while finding spec" formatting slightly more appealing, and document and test that the module name must be absolute.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/runpy.rst3
-rw-r--r--Doc/using/cmdline.rst2
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst
index 7293f15..78d0143 100644
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -36,7 +36,8 @@ The :mod:`runpy` module provides two functions:
import mechanism (refer to :pep:`302` for details) and then executed in a
fresh module namespace.
- If the supplied module name refers to a package rather than a normal
+ The *mod_name* argument should be an absolute module name.
+ If the module name refers to a package rather than a normal
module, then that package is imported and the ``__main__`` submodule within
that package is then executed and the resulting module globals dictionary
returned.
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index c7210a0..af86055 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -77,7 +77,7 @@ source.
the :mod:`__main__` module.
Since the argument is a *module* name, you must not give a file extension
- (``.py``). The ``module-name`` should be a valid Python module name, but
+ (``.py``). The module name should be a valid absolute Python module name, but
the implementation may not always enforce this (e.g. it may allow you to
use a name that includes a hyphen).