[Python-checkins] r69279 - in python/branches/py3k: Doc/glossary.rst Doc/library/collections.rst Doc/library/itertools.rst Lib/test/test_itertools.py

Wed Feb 4 20:45:13 CET 2009

Author: raymond.hettinger
Date: Wed Feb 4 20:45:13 2009
New Revision: 69279
Log:
Minor doc fixes.
Modified:
 python/branches/py3k/Doc/glossary.rst
 python/branches/py3k/Doc/library/collections.rst
 python/branches/py3k/Doc/library/itertools.rst
 python/branches/py3k/Lib/test/test_itertools.py
Modified: python/branches/py3k/Doc/glossary.rst
==============================================================================

--- python/branches/py3k/Doc/glossary.rst	(original)
+++ python/branches/py3k/Doc/glossary.rst	Wed Feb 4 20:45:13 2009
@@ -393,7 +393,7 @@
 also :term:`immutable`.
 
 named tuple
- Any tuple subclass whose indexable elements are also accessible using
+ Any tuple-like class whose indexable elements are also accessible using
 named attributes (for example, :func:`time.localtime` returns a
 tuple-like object where the *year* is accessible either with an
 index such as ``t[0]`` or with a named attribute like ``t.tm_year``).
Modified: python/branches/py3k/Doc/library/collections.rst
==============================================================================
--- python/branches/py3k/Doc/library/collections.rst	(original)
+++ python/branches/py3k/Doc/library/collections.rst	Wed Feb 4 20:45:13 2009
@@ -206,7 +206,7 @@
 .. method:: most_common([n])
 
 Return a list of the *n* most common elements and their counts from the
- most common to the least. If *n* not specified, :func:`most_common`
+ most common to the least. If *n* is not specified, :func:`most_common`
 returns *all* elements in the counter. Elements with equal counts are
 ordered arbitrarily::
 
Modified: python/branches/py3k/Doc/library/itertools.rst
==============================================================================
--- python/branches/py3k/Doc/library/itertools.rst	(original)
+++ python/branches/py3k/Doc/library/itertools.rst	Wed Feb 4 20:45:13 2009
@@ -290,7 +290,7 @@
 
 class groupby(object):
 # [k for k, g in groupby('AAAABBBCCDAABBB')] --> A B C D A B
- # [(list(g)) for k, g in groupby('AAAABBBCCD')] --> AAAA BBB CC D
+ # [list(g) for k, g in groupby('AAAABBBCCD')] --> AAAA BBB CC D
 def __init__(self, iterable, key=None):
 if key is None:
 key = lambda x: x
@@ -591,8 +591,8 @@
 return map(function, count(start))
 
 def nth(iterable, n):
- "Returns the nth item or empty list"
- return list(islice(iterable, n, n+1))
+ "Returns the nth item or None"
+ return next(islice(iterable, n, None), None)
 
 def quantify(iterable, pred=bool):
 "Count how many times the predicate is true"
Modified: python/branches/py3k/Lib/test/test_itertools.py
==============================================================================
--- python/branches/py3k/Lib/test/test_itertools.py	(original)
+++ python/branches/py3k/Lib/test/test_itertools.py	Wed Feb 4 20:45:13 2009
@@ -1371,8 +1371,8 @@
 ... return map(function, count(start))
 
 >>> def nth(iterable, n):
-... "Returns the nth item or empty list"
-... return list(islice(iterable, n, n+1))
+... "Returns the nth item or None"
+... return next(islice(iterable, n, None), None)
 
 >>> def quantify(iterable, pred=bool):
 ... "Count how many times the predicate is true"
@@ -1469,7 +1469,10 @@
 [0, 2, 4, 6]
 
 >>> nth('abcde', 3)
-['d']
+'d'
+
+>>> nth('abcde', 9) is None
+True
 
 >>> quantify(range(99), lambda x: x%2==0)
 50
