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 (Sat, 20 Mar 2010) | 1 line
document exitfunc fixer
........
r79139 | benjamin.peterson | 2010-03-20 11:17:37 -0500 (Sat, 20 Mar 2010) | 1 line
wrap
........
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index 6f675b0..a0a4610 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -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.