summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2010-07-02 15:57:50 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2010-07-02 15:57:50 (GMT)
commit9fc68c4e7052a0d05753e4ef0ee9edbe68f810eb (patch)
treeab70d8e7c25527c407da4c98ac9d4ac0c783fddb
parentf751bc9c01b8c5c3dd99e188b348a63eb0b893af (diff)
downloadcpython-9fc68c4e7052a0d05753e4ef0ee9edbe68f810eb.zip
cpython-9fc68c4e7052a0d05753e4ef0ee9edbe68f810eb.tar.gz
cpython-9fc68c4e7052a0d05753e4ef0ee9edbe68f810eb.tar.bz2
Merged revisions 82439 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line Fix a couple of minor nits in What's New before the release goes out ........
-rw-r--r--Doc/whatsnew/2.7.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index ded7f7e..72aa7e6 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -861,10 +861,10 @@ across operating systems and shells.)
When running a module using the interpreter's :option:`-m` switch,
``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located, while executing the :file:`__init__.py` files
-for any parent packages of the module to be executed.
-(Suggested by Michael Foord; implemented by Nick Coghlan;
-:issue:`8202`.)
+module is being located. This change is visible to user code while
+executing the :file:`__init__.py` files for any parent packages of
+the module to be executed. (Suggested by Michael Foord; implemented
+by Nick Coghlan; :issue:`8202`.)
.. ======================================================================
@@ -1420,9 +1420,9 @@ changes, or look through the Subversion logs for all the details.
``sys.path`` and the module :mod:`__main__` will be imported. It's
expected that the directory or zip contains a :file:`__main__.py`;
if it doesn't, some other :file:`__main__.py` might be imported from
- a location later in ``sys.path``. This makes some of the machinery
+ a location later in ``sys.path``. This makes more of the machinery
of :mod:`runpy` available to scripts that want to mimic the way
- Python's :option:`-m` processes an explicit path name.
+ Python's command line processes an explicit path name.
(Added by Nick Coghlan; :issue:`6816`.)
* New function: in the :mod:`shutil` module, :func:`~shutil.make_archive`