diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/itertools.rst | 27 | ||||
| -rw-r--r-- | Doc/library/trace.rst | 5 | ||||
| -rw-r--r-- | Doc/using/unix.rst | 2 | ||||
| -rw-r--r-- | Doc/using/windows.rst | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index d04f33b..826fa45 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -95,21 +95,20 @@ loops that truncate the stream. def combinations(iterable, r): pool = tuple(iterable) - if pool: - n = len(pool) - vec = range(r) - yield tuple(pool[i] for i in vec) - while 1: - for i in reversed(range(r)): - if vec[i] == i + n-r: - continue - vec[i] += 1 - for j in range(i+1, r): - vec[j] = vec[j-1] + 1 - yield tuple(pool[i] for i in vec) + n = len(pool) + assert 0 <= r <= n + vec = range(r) + yield tuple(pool[i] for i in vec) + while 1: + for i in reversed(range(r)): + if vec[i] != i + n - r: break - else: - return + else: + return + vec[i] += 1 + for j in range(i+1, r): + vec[j] = vec[j-1] + 1 + yield tuple(pool[i] for i in vec) .. versionadded:: 2.6 diff --git a/Doc/library/trace.rst b/Doc/library/trace.rst index 9d0c0c4..05d5d66 100644 --- a/Doc/library/trace.rst +++ b/Doc/library/trace.rst @@ -80,7 +80,7 @@ Programming Interface --------------------- -.. class:: Trace([count=1[, trace=1[, countfuncs=0[, countcallers=0[, ignoremods=()[, ignoredirs=()[, infile=None[, outfile=None]]]]]]]]) +.. class:: Trace([count=1[, trace=1[, countfuncs=0[, countcallers=0[, ignoremods=()[, ignoredirs=()[, infile=None[, outfile=None[, timing=False]]]]]]]]]) Create an object to trace execution of a single statement or expression. All parameters are optional. *count* enables counting of line numbers. *trace* @@ -89,7 +89,8 @@ Programming Interface *ignoremods* is a list of modules or packages to ignore. *ignoredirs* is a list of directories whose modules or packages should be ignored. *infile* is the file from which to read stored count information. *outfile* is a file in which - to write updated count information. + to write updated count information. *timing* enables a timestamp relative + to when tracing was started to be displayed. .. method:: Trace.run(cmd) diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst index cc99a62..69b76c6 100644 --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -20,7 +20,7 @@ package on all others. However there are certain features you might want to use that are not available on your distro's package. You can easily compile the latest version of Python from source. -In the event Python doesn't come preinstalled and isn't in the repositories as +In the event that Python doesn't come preinstalled and isn't in the repositories as well, you can easily make packages for your own distro. Have a look at the following links: diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 1753b6d..cd706a7 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -21,7 +21,7 @@ has compiled Windows installers (MSI packages) with every `release <http://www.python.org/download/releases/>`_ for many years. With ongoing development of Python, some platforms that used to be supported -earlier are not longer supported (due to the lack of users or developers). +earlier are no longer supported (due to the lack of users or developers). Check :pep:`11` for details on all unsupported platforms. * DOS and Windows 3.x are deprecated since Python 2.0 and code specific to these |