[Python-checkins] r79260 - in python/branches/py3k: Doc/library/2to3.rst

Mon Mar 22 00:17:57 CET 2010

Author: benjamin.peterson
Date: Mon Mar 22 00:17:57 2010
New Revision: 79260
Log:
Merged revisions 79138-79139 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r79138 | benjamin.peterson | 2010年03月20日 11:16:44 -0500 (2010年3月20日) | 1 line
 
 document exitfunc fixer
........
 r79139 | benjamin.peterson | 2010年03月20日 11:17:37 -0500 (2010年3月20日) | 1 line
 
 wrap
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/2to3.rst
Modified: python/branches/py3k/Doc/library/2to3.rst
==============================================================================

--- python/branches/py3k/Doc/library/2to3.rst	(original)
+++ python/branches/py3k/Doc/library/2to3.rst	Mon Mar 22 00:17:57 2010
@@ -130,8 +130,8 @@
 Fixes dictionary iteration methods. :meth:`dict.iteritems` is converted to
 :meth:`dict.items`, :meth:`dict.iterkeys` to :meth:`dict.keys`, and
 :meth:`dict.itervalues` to :meth:`dict.values`. Similarly,
- :meth:`dict.viewitems`, :meth:`dict.viewkeys` and :meth:`dict.viewvalues`
- are converted respectively to :meth:`dict.items`, :meth:`dict.keys` and
+ :meth:`dict.viewitems`, :meth:`dict.viewkeys` and :meth:`dict.viewvalues` are
+ converted respectively to :meth:`dict.items`, :meth:`dict.keys` and
 :meth:`dict.values`. It also wraps existing usages of :meth:`dict.items`,
 :meth:`dict.keys`, and :meth:`dict.values` in a call to :class:`list`.
 
@@ -148,6 +148,11 @@
 Removes usage of :func:`execfile`. The argument to :func:`execfile` is
 wrapped in calls to :func:`open`, :func:`compile`, and :func:`exec`.
 
+.. 2to3fixer:: exitfunc
+
+ Changes assignment of :attr:`sys.exitfunc` to use of the :mod:`atexit`
+ module.
+
 .. 2to3fixer:: filter
 
 Wraps :func:`filter` usage in a :class:`list` call.
