diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-04 06:53:44 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-04 06:53:44 (GMT) |
| commit | 0be8b1c742d974a38b1af8804b7a764dfddd3a2f (patch) | |
| tree | 8182c7582f08b7b6ab3fecb22330688d4ec7faf9 | |
| parent | 993a5ee02669a4f90ce820aaec3f4bf3e6ba1718 (diff) | |
| download | cpython-0be8b1c742d974a38b1af8804b7a764dfddd3a2f.zip cpython-0be8b1c742d974a38b1af8804b7a764dfddd3a2f.tar.gz cpython-0be8b1c742d974a38b1af8804b7a764dfddd3a2f.tar.bz2 | |
Merged revisions 79733,79735 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79733 | ezio.melotti | 2010-04-04 09:41:27 +0300 (Sun, 04 Apr 2010) | 1 line
Add a versionadded to Counter.subtract() doc.
........
r79735 | ezio.melotti | 2010-04-04 09:50:58 +0300 (Sun, 04 Apr 2010) | 1 line
Revert 79733 - Counter is new in 2.7, the versionadded is not necessary - and fix a typo.
........
| -rw-r--r-- | Doc/library/collections.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 3d04063..e5036d5 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -191,7 +191,7 @@ For example:: .. versionadded:: 3.1 - Counter objects support two methods beyond those available for all + Counter objects support three methods beyond those available for all dictionaries: .. method:: elements() @@ -225,6 +225,8 @@ For example:: >>> c.subtract(d) Counter({'a': 3, 'b': 0, 'c': -3, 'd': -6}) + .. versionadded:: 3.2 + The usual dictionary methods are available for :class:`Counter` objects except for two which work differently for counters. |