From: Ezio Melotti Date: Sun, 4 Apr 2010 06:53:44 +0000 (+0000) Subject: Merged revisions 79733,79735 via svnmerge from X-Git-Tag: v3.2a1~1239 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0be8b1c742d974a38b1af8804b7a764dfddd3a2f;p=thirdparty%2FPython%2Fcpython.git 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. ........ --- diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 3d04063adee8..e5036d5a6b71 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.