diff options
author | Raymond Hettinger <python@rcn.com> | 2011-03-16 00:25:51 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2011-03-16 00:25:51 (GMT) |
commit | 15aded8b73256bc94fdd2e74b0c2c90fed46bb7e (patch) | |
tree | 93c819ff649b4913522baa3758e28dac32763d7a /Doc/library/collections.rst | |
parent | dcebe0f2dca40a22654c5f09ce1bd141419ea8d3 (diff) | |
download | cpython-15aded8b73256bc94fdd2e74b0c2c90fed46bb7e.zip cpython-15aded8b73256bc94fdd2e74b0c2c90fed46bb7e.tar.gz cpython-15aded8b73256bc94fdd2e74b0c2c90fed46bb7e.tar.bz2 |
Emphasize the ['x', 'y'] option for listing field names. Remove PS2 prompts to make the examples cut-and-pasteable.
Diffstat (limited to 'Doc/library/collections.rst')
-rw-r--r-- | Doc/library/collections.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 8b80b64..0fadc26 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -590,7 +590,7 @@ they add the ability to access fields by name instead of position index. :options: +NORMALIZE_WHITESPACE >>> # Basic example - >>> Point = namedtuple('Point', 'x y') + >>> Point = namedtuple('Point', ['x', 'y']) >>> p = Point(x=10, y=11) >>> # Example using the verbose option to print the class definition @@ -735,15 +735,15 @@ functionality with a subclass. Here is how to add a calculated field and a fixed-width print format: >>> class Point(namedtuple('Point', 'x y')): - ... __slots__ = () - ... @property - ... def hypot(self): - ... return (self.x ** 2 + self.y ** 2) ** 0.5 - ... def __str__(self): - ... return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) + __slots__ = () + @property + def hypot(self): + return (self.x ** 2 + self.y ** 2) ** 0.5 + 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): - ... print(p) + print(p) Point: x= 3.000 y= 4.000 hypot= 5.000 Point: x=14.000 y= 0.714 hypot=14.018 @@ -770,7 +770,7 @@ and more efficient to use a simple class declaration: >>> Status.open, Status.pending, Status.closed (0, 1, 2) >>> class Status: - ... open, pending, closed = range(3) + open, pending, closed = range(3) .. seealso:: |