[Python-checkins] r74766 - in python/branches/release31-maint: Doc/c-api/mapping.rst Doc/library/collections.rst Doc/library/doctest.rst Doc/library/modulefinder.rst Doc/library/shelve.rst

Sun Sep 13 10:08:32 CEST 2009

Author: ezio.melotti
Date: Sun Sep 13 10:08:32 2009
New Revision: 74766
Log:
Merged revisions 74762 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r74762 | ezio.melotti | 2009年09月13日 07:48:45 +0300 (2009年9月13日) | 1 line
 
 more list()s on dictviews
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/c-api/mapping.rst
 python/branches/release31-maint/Doc/library/collections.rst
 python/branches/release31-maint/Doc/library/doctest.rst
 python/branches/release31-maint/Doc/library/modulefinder.rst
 python/branches/release31-maint/Doc/library/shelve.rst
Modified: python/branches/release31-maint/Doc/c-api/mapping.rst
==============================================================================

--- python/branches/release31-maint/Doc/c-api/mapping.rst	(original)
+++ python/branches/release31-maint/Doc/c-api/mapping.rst	Sun Sep 13 10:08:32 2009
@@ -51,20 +51,20 @@
 .. cfunction:: PyObject* PyMapping_Keys(PyObject *o)
 
 On success, return a list of the keys in object *o*. On failure, return *NULL*.
- This is equivalent to the Python expression ``o.keys()``.
+ This is equivalent to the Python expression ``list(o.keys())``.
 
 
 .. cfunction:: PyObject* PyMapping_Values(PyObject *o)
 
 On success, return a list of the values in object *o*. On failure, return
- *NULL*. This is equivalent to the Python expression ``o.values()``.
+ *NULL*. This is equivalent to the Python expression ``list(o.values())``.
 
 
 .. cfunction:: PyObject* PyMapping_Items(PyObject *o)
 
 On success, return a list of the items in object *o*, where each item is a tuple
 containing a key-value pair. On failure, return *NULL*. This is equivalent to
- the Python expression ``o.items()``.
+ the Python expression ``list(o.items())``.
 
 
 .. cfunction:: PyObject* PyMapping_GetItemString(PyObject *o, char *key)
Modified: python/branches/release31-maint/Doc/library/collections.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/collections.rst	(original)
+++ python/branches/release31-maint/Doc/library/collections.rst	Sun Sep 13 10:08:32 2009
@@ -669,7 +669,7 @@
 'Return a new Point object replacing specified fields with new values'
 result = _self._make(map(kwds.pop, ('x', 'y'), _self))
 if kwds:
- raise ValueError('Got unexpected field names: %r' % kwds.keys())
+ raise ValueError('Got unexpected field names: %r' % list(kwds.keys()))
 return result
 <BLANKLINE>
 def __getnewargs__(self):
Modified: python/branches/release31-maint/Doc/library/doctest.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/doctest.rst	(original)
+++ python/branches/release31-maint/Doc/library/doctest.rst	Sun Sep 13 10:08:32 2009
@@ -701,8 +701,7 @@
 
 instead. Another is to do ::
 
- >>> d = foo().items()
- >>> d.sort()
+ >>> d = sorted(foo().items())
 >>> d
 [('Harry', 'broomstick'), ('Hermione', 'hippogryph')]
 
Modified: python/branches/release31-maint/Doc/library/modulefinder.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/modulefinder.rst	(original)
+++ python/branches/release31-maint/Doc/library/modulefinder.rst	Sun Sep 13 10:08:32 2009
@@ -84,7 +84,7 @@
 print('Loaded modules:')
 for name, mod in finder.modules.items():
 print('%s: ' % name, end='')
- print(','.join(mod.globalnames.keys()[:3]))
+ print(','.join(list(mod.globalnames.keys())[:3]))
 
 print('-'*50)
 print('Modules not imported:')
Modified: python/branches/release31-maint/Doc/library/shelve.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/shelve.rst	(original)
+++ python/branches/release31-maint/Doc/library/shelve.rst	Sun Sep 13 10:08:32 2009
@@ -141,8 +141,8 @@
 # such key)
 del d[key] # delete data stored at key (raises KeyError
 # if no such key)
- flag = key in d # true if the key exists
- klist = d.keys() # a list of all existing keys (slow!)
+ flag = key in d # true if the key exists
+ klist = list(d.keys()) # a list of all existing keys (slow!)
 
 # as d was opened WITHOUT writeback=True, beware:
 d['xx'] = range(4) # this works as expected, but...
