From 4e74fc82eaa4617953bdd441f606002420df5ed0 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 21 Mar 2010 23:22:58 +0000 Subject: [PATCH] Merged revisions 79260 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79260 | benjamin.peterson | 2010-03-21 18:17:57 -0500 (Sun, 21 Mar 2010) | 13 lines 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 ........ ................ --- Doc/library/2to3.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index 20a6245dc6..a0a46103a9 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -129,9 +129,11 @@ and off individually. They are described here in more detail. 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`. It also wraps existing - usages of :meth:`dict.items`, :meth:`dict.keys`, and :meth:`dict.values` in a - call to :class:`list`. + :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.values`. It also wraps existing usages of :meth:`dict.items`, + :meth:`dict.keys`, and :meth:`dict.values` in a call to :class:`list`. .. 2to3fixer:: except @@ -146,6 +148,11 @@ and off individually. They are described here in more detail. 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. -- 2.40.0