diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-03-01 04:10:55 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-03-01 04:10:55 +0000 |
| commit | 807e98e0afde0441349d9e627391a88e9f6fb9db (patch) | |
| tree | 84bd79cd12457c9877db0913efb9842c410bf6c7 /Objects/setobject.c | |
| parent | ff3186401c0cd060a3d465914a4a9e521ed128f9 (diff) | |
| download | cpython-git-807e98e0afde0441349d9e627391a88e9f6fb9db.tar.gz | |
Merged revisions 78541 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78541 | ezio.melotti | 2010-03-01 06:08:34 +0200 (Mon, 01 Mar 2010) | 17 lines
Merged revisions 78515-78516,78522 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78515 | georg.brandl | 2010-02-28 20:19:17 +0200 (Sun, 28 Feb 2010) | 1 line
#8030: make builtin type docstrings more consistent: use "iterable" instead of "seq(uence)", use "new" to show that set() always returns a new object.
........
r78516 | georg.brandl | 2010-02-28 20:26:37 +0200 (Sun, 28 Feb 2010) | 1 line
The set types can also be called without arguments.
........
r78522 | ezio.melotti | 2010-03-01 01:59:00 +0200 (Mon, 01 Mar 2010) | 1 line
#8030: more docstring fix for builtin types.
........
................
Diffstat (limited to 'Objects/setobject.c')
| -rw-r--r-- | Objects/setobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index 27b41a10e4..742dadcaa2 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -2090,7 +2090,8 @@ static PyNumberMethods set_as_number = { }; PyDoc_STRVAR(set_doc, -"set(iterable) --> set object\n\ +"set() -> new empty set object\n\ +set(iterable) -> new set object\n\ \n\ Build an unordered collection of unique elements."); @@ -2187,7 +2188,8 @@ static PyNumberMethods frozenset_as_number = { }; PyDoc_STRVAR(frozenset_doc, -"frozenset(iterable) --> frozenset object\n\ +"frozenset() -> empty frozenset object\n\ +frozenset(iterable) -> frozenset object\n\ \n\ Build an immutable unordered collection of unique elements."); |