summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-12-11 03:35:31 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-12-11 03:35:31 (GMT)
commit8c0b5b998ae3319294a366cfb0bdad9fc88ff1fc (patch)
tree0c69571deae55a9d57e52b75c968ff0f36dde87a /Doc
parent36ff997988bdf2a72f362e60b7b03f439506411c (diff)
parent7dda421bfff887da9a84e99c37ef1b0ef9f3cde9 (diff)
downloadcpython-8c0b5b998ae3319294a366cfb0bdad9fc88ff1fc.zip
cpython-8c0b5b998ae3319294a366cfb0bdad9fc88ff1fc.tar.gz
cpython-8c0b5b998ae3319294a366cfb0bdad9fc88ff1fc.tar.bz2
Issue #14285: Merge runpy fix from 3.5
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).