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 (Sun, 13 Sep 2009) | 1 line

  more list()s on dictviews
........
This commit is contained in:
Ezio Melotti 2009-09-13 08:08:32 +00:00
parent b2f9e3bd5b
commit 2befd9a34c
5 changed files with 8 additions and 9 deletions

View File

@ -51,20 +51,20 @@ Mapping Protocol
.. cfunction:: PyObject* PyMapping_Keys(PyObject *o) .. cfunction:: PyObject* PyMapping_Keys(PyObject *o)
On success, return a list of the keys in object *o*. On failure, return *NULL*. 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) .. cfunction:: PyObject* PyMapping_Values(PyObject *o)
On success, return a list of the values in object *o*. On failure, return 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) .. cfunction:: PyObject* PyMapping_Items(PyObject *o)
On success, return a list of the items in object *o*, where each item is a tuple 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 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) .. cfunction:: PyObject* PyMapping_GetItemString(PyObject *o, char *key)

View File

@ -669,7 +669,7 @@ Example:
'Return a new Point object replacing specified fields with new values' 'Return a new Point object replacing specified fields with new values'
result = _self._make(map(kwds.pop, ('x', 'y'), _self)) result = _self._make(map(kwds.pop, ('x', 'y'), _self))
if kwds: if kwds:
raise ValueError('Got unexpected field names: %r' % kwds.keys()) raise ValueError('Got unexpected field names: %r' % list(kwds.keys()))
return result return result
<BLANKLINE> <BLANKLINE>
def __getnewargs__(self): def __getnewargs__(self):

View File

@ -701,8 +701,7 @@ is vulnerable! One workaround is to do ::
instead. Another is to do :: instead. Another is to do ::
>>> d = foo().items() >>> d = sorted(foo().items())
>>> d.sort()
>>> d >>> d
[('Harry', 'broomstick'), ('Hermione', 'hippogryph')] [('Harry', 'broomstick'), ('Hermione', 'hippogryph')]

View File

@ -84,7 +84,7 @@ The script that will output the report of bacon.py::
print('Loaded modules:') print('Loaded modules:')
for name, mod in finder.modules.items(): for name, mod in finder.modules.items():
print('%s: ' % name, end='') print('%s: ' % name, end='')
print(','.join(mod.globalnames.keys()[:3])) print(','.join(list(mod.globalnames.keys())[:3]))
print('-'*50) print('-'*50)
print('Modules not imported:') print('Modules not imported:')

View File

@ -141,8 +141,8 @@ object)::
# such key) # such key)
del d[key] # delete data stored at key (raises KeyError del d[key] # delete data stored at key (raises KeyError
# if no such key) # if no such key)
flag = key in d # true if the key exists flag = key in d # true if the key exists
klist = d.keys() # a list of all existing keys (slow!) klist = list(d.keys()) # a list of all existing keys (slow!)
# as d was opened WITHOUT writeback=True, beware: # as d was opened WITHOUT writeback=True, beware:
d['xx'] = range(4) # this works as expected, but... d['xx'] = range(4) # this works as expected, but...