mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

A few more fixes to the tutorial

Browse source
This commit is contained in:
Neal Norwitz 2007-08-31 03:46:28 +00:00
parent 7aa02e6590
commit e0906d13c3
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/tutorial/controlflow.rst
View file

@ -436,8 +436,7 @@ function like this::
print("-- I'm sorry, we're all out of", kind) print("-- I'm sorry, we're all out of", kind)
for arg in arguments: print arg for arg in arguments: print arg
print('-'*40) print('-'*40)
keys = keywords.keys() keys = sorted(keywords.keys())
keys.sort()
for kw in keys: print(kw, ':', keywords[kw]) for kw in keys: print(kw, ':', keywords[kw])
It could be called like this:: It could be called like this::

10
Doc/tutorial/datastructures.rst
View file

@ -400,12 +400,12 @@ Here is a small example using a dictionary::
>>> tel['irv'] = 4127 >>> tel['irv'] = 4127
>>> tel >>> tel
{'guido': 4127, 'irv': 4127, 'jack': 4098} {'guido': 4127, 'irv': 4127, 'jack': 4098}
>>> tel.keys() >>> list(tel.keys())
['guido', 'irv', 'jack'] ['guido', 'irv', 'jack']
>>> tel.has_key('guido')
True
>>> 'guido' in tel >>> 'guido' in tel
True True
>>> 'jack' not in tel
False
The :func:`dict` constructor builds dictionaries directly from lists of The :func:`dict` constructor builds dictionaries directly from lists of
key-value pairs stored as tuples. When the pairs form a pattern, list key-value pairs stored as tuples. When the pairs form a pattern, list
@ -435,10 +435,10 @@ Looping Techniques
================== ==================
When looping through dictionaries, the key and corresponding value can be When looping through dictionaries, the key and corresponding value can be
retrieved at the same time using the :meth:`iteritems` method. :: retrieved at the same time using the :meth:`items` method. ::
>>> knights = {'gallahad': 'the pure', 'robin': 'the brave'} >>> knights = {'gallahad': 'the pure', 'robin': 'the brave'}
>>> for k, v in knights.iteritems(): >>> for k, v in knights.items():
... print(k, v) ... print(k, v)
... ...
gallahad the pure gallahad the pure