From: Alexandre Vassalotti Date: Tue, 12 Jan 2010 18:38:14 +0000 (+0000) Subject: Merged revisions 77445 via svnmerge from X-Git-Tag: v3.2a1~1858 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a515bab035ef19e923e781171115c4a3a7f4e8fe;p=thirdparty%2FPython%2Fcpython.git Merged revisions 77445 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77445 | alexandre.vassalotti | 2010-01-12 13:25:33 -0500 (Tue, 12 Jan 2010) | 2 lines Added documentation for dictionary views fixer. ........ --- diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index 20a6245dc656..6f675b057654 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