diff options
Diffstat (limited to 'Doc/tutorial')
| -rw-r--r-- | Doc/tutorial/controlflow.rst | 3 | ||||
| -rw-r--r-- | Doc/tutorial/datastructures.rst | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index 0d9a21d..ebd531e 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -436,8 +436,7 @@ function like this:: print("-- I'm sorry, we're all out of", kind) for arg in arguments: print arg print('-'*40) - keys = keywords.keys() - keys.sort() + keys = sorted(keywords.keys()) for kw in keys: print(kw, ':', keywords[kw]) It could be called like this:: diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index 77088f3..20bade5 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -400,12 +400,12 @@ Here is a small example using a dictionary:: >>> tel['irv'] = 4127 >>> tel {'guido': 4127, 'irv': 4127, 'jack': 4098} - >>> tel.keys() + >>> list(tel.keys()) ['guido', 'irv', 'jack'] - >>> tel.has_key('guido') - True >>> 'guido' in tel True + >>> 'jack' not in tel + False The :func:`dict` constructor builds dictionaries directly from lists of 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 -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'} - >>> for k, v in knights.iteritems(): + >>> for k, v in knights.items(): ... print(k, v) ... gallahad the pure |