diff options
author | Raymond Hettinger <python@rcn.com> | 2016-11-21 23:13:38 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2016-11-21 23:13:38 (GMT) |
commit | 1f56e25412dbb538c1ea707daddefe18ccd1adff (patch) | |
tree | 1c316c2d205893b9b7681a7d1aa6575c657a7bdf | |
parent | 4878d001b173788c9dceb756c6e76aa5ed111967 (diff) | |
parent | 7f946195558b3681b81707c52b721d067373acee (diff) | |
download | cpython-1f56e25412dbb538c1ea707daddefe18ccd1adff.zip cpython-1f56e25412dbb538c1ea707daddefe18ccd1adff.tar.gz cpython-1f56e25412dbb538c1ea707daddefe18ccd1adff.tar.bz2 |
merge
-rw-r--r-- | Doc/library/random.rst | 4 | ||||
-rw-r--r-- | Doc/tutorial/datastructures.rst | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Doc/library/random.rst b/Doc/library/random.rst index b0f8194..115ef81 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -465,11 +465,11 @@ Simulation of arrival times and service deliveries in a single server queue:: <http://nbviewer.jupyter.org/url/norvig.com/ipython/Economics.ipynb>`_ a simulation of a marketplace by `Peter Norvig <http://norvig.com/bio.html>`_ that shows effective - use of many the tools and distributions provided by this module + use of many of the tools and distributions provided by this module (gauss, uniform, sample, betavariate, choice, triangular, and randrange). `A Concrete Introduction to Probability (using Python) <http://nbviewer.jupyter.org/url/norvig.com/ipython/Probability.ipynb>`_ a tutorial by `Peter Norvig <http://norvig.com/bio.html>`_ covering the basics of probability theory, how to write simulations, and - performing data analysis using Python. + how to perform data analysis using Python. diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index b39bdf4..83a1f9b 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -60,11 +60,16 @@ objects: Remove all items from the list. Equivalent to ``del a[:]``. -.. method:: list.index(x) +.. method:: list.index(x[, start[, end]]) :noindex: - Return the index in the list of the first item whose value is *x*. It is an - error if there is no such item. + Return zero-based index in the list of the first item whose value is *x*. + Raises a :exc:`ValueError` if there is no such item. + + The optional arguments *start* and *end* are interpreted as in the slice + notation and are used to limit the search to a particular subsequence of + *x*. The returned index is computed relative to the beginning of the full + sequence rather than the *start* argument. .. method:: list.count(x) @@ -103,6 +108,8 @@ An example that uses most of the list methods:: [66.25, 333, -1, 333, 1, 1234.5, 333] >>> a.index(333) 1 + >>> a.index(333, 2) # search for 333 starting at index 2 + 2 >>> a.remove(333) >>> a [66.25, -1, 333, 1, 1234.5, 333] |