mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Emphasize the ['x', 'y'] option for listing field names. Remove PS2 prompts to make the examples cut-and-pasteable.

Browse source
This commit is contained in:
Raymond Hettinger 2011-03-15 17:25:51 -07:00
parent dcebe0f2dc
commit 15aded8b73
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Doc/library/collections.rst
View file

@ -590,7 +590,7 @@ they add the ability to access fields by name instead of position index.
:options: +NORMALIZE_WHITESPACE :options: +NORMALIZE_WHITESPACE
>>> # Basic example >>> # Basic example
>>> Point = namedtuple('Point', 'x y') >>> Point = namedtuple('Point', ['x', 'y'])
>>> p = Point(x=10, y=11) >>> p = Point(x=10, y=11)
>>> # Example using the verbose option to print the class definition >>> # 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: a fixed-width print format:
>>> class Point(namedtuple('Point', 'x y')): >>> class Point(namedtuple('Point', 'x y')):
... __slots__ = () __slots__ = ()
... @property @property
... def hypot(self): def hypot(self):
... return (self.x ** 2 + self.y ** 2) ** 0.5 return (self.x ** 2 + self.y ** 2) ** 0.5
... def __str__(self): def __str__(self):
... return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) 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) print(p)
Point: x= 3.000 y= 4.000 hypot= 5.000 Point: x= 3.000 y= 4.000 hypot= 5.000
Point: x=14.000 y= 0.714 hypot=14.018 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 >>> Status.open, Status.pending, Status.closed
(0, 1, 2) (0, 1, 2)
>>> class Status: >>> class Status:
... open, pending, closed = range(3) open, pending, closed = range(3)
.. seealso:: .. seealso::