diff options
| -rw-r--r-- | Doc/howto/functional.rst | 10 | ||||
| -rw-r--r-- | Doc/library/collections.rst | 2 | ||||
| -rw-r--r-- | Doc/library/reprlib.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst index 2e09358..d0e31e8 100644 --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -69,9 +69,9 @@ output must only depend on its input. Some languages are very strict about purity and don't even have assignment statements such as ``a=3`` or ``c = a + b``, but it's difficult to avoid all side effects. Printing to the screen or writing to a disk file are side -effects, for example. For example, in Python a ``print`` statement or a -``time.sleep(1)`` both return no useful value; they're only called for their -side effects of sending some text to the screen or pausing execution for a +effects, for example. For example, in Python a call to the :func:`print` or +:func:`time.sleep` function both return no useful value; they're only called for +their side effects of sending some text to the screen or pausing execution for a second. Python programs written in functional style usually won't go to the extreme of @@ -1031,8 +1031,8 @@ value and an iterator for the elements with that key. ... ] - def get_state ((city, state)): - return state + def get_state (city_state): + return city_state[1] itertools.groupby(city_list, get_state) => ('AL', iterator-1), diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 7dd8848..8bcc2ac 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -632,7 +632,7 @@ a fixed-width print format: ... def __str__(self): ... return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) - >>> for p in Point(3, 4), Point(14, 5/7.): + >>> for p in Point(3, 4), Point(14, 5/7): ... print(p) Point: x= 3.000 y= 4.000 hypot= 5.000 Point: x=14.000 y= 0.714 hypot=14.018 diff --git a/Doc/library/reprlib.rst b/Doc/library/reprlib.rst index e503442..aad6f66 100644 --- a/Doc/library/reprlib.rst +++ b/Doc/library/reprlib.rst @@ -126,7 +126,7 @@ for file objects could be added:: if obj.name in ['<stdin>', '<stdout>', '<stderr>']: return obj.name else: - return `obj` + return repr(obj) aRepr = MyRepr() print aRepr.repr(sys.stdin) # prints '<stdin>' diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 3ec06db..1e43128 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -676,8 +676,8 @@ Delimiters The following tokens serve as delimiters in the grammar:: - ( ) [ ] { } @ - , : . ` = ; + ( ) [ ] { } + , : . ; @ = += -= *= /= //= %= &= |= ^= >>= <<= **= |