From: Zachary Ware Date: Tue, 9 Aug 2016 22:28:33 +0000 (-0500) Subject: Issue #27205: Fix doctests in Doc/library/collections.rst X-Git-Tag: v2.7.13rc1~224 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa1ce08fc612a34f8288728c86087a3ac646331a;p=thirdparty%2FPython%2Fcpython.git Issue #27205: Fix doctests in Doc/library/collections.rst --- diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 4231e8ce2cee..518e49029f38 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -608,7 +608,7 @@ Example: _fields = ('x', 'y') def __new__(_cls, x, y): - 'Create a new instance of Point(x, y)' + 'Create new instance of Point(x, y)' return _tuple.__new__(_cls, (x, y)) @classmethod @@ -635,7 +635,7 @@ Example: return result def __getnewargs__(self): - 'Return self as a plain tuple. Used by copy and pickle.' + 'Return self as a plain tuple. Used by copy and pickle.' return tuple(self) __dict__ = _property(_asdict) @@ -648,6 +648,7 @@ Example: y = _property(_itemgetter(1), doc='Alias for field number 1') + >>> p = Point(11, y=22) # instantiate with positional or keyword arguments >>> p[0] + p[1] # indexable like the plain tuple (11, 22) @@ -712,7 +713,7 @@ field names, the method and attribute names start with an underscore. Point(x=33, y=22) >>> for partnum, record in inventory.items(): - inventory[partnum] = record._replace(price=newprices[partnum], timestamp=time.now()) + ... inventory[partnum] = record._replace(price=newprices[partnum], timestamp=time.now()) .. attribute:: somenamedtuple._fields @@ -747,15 +748,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 @@ -781,7 +782,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::