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/dictobject.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/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 03f2010ed5..1d36e1d4dc 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2100,12 +2100,12 @@ dict_iter(PyDictObject *dict) } PyDoc_STRVAR(dictionary_doc, -"dict() -> new empty dictionary.\n" +"dict() -> new empty dictionary\n" "dict(mapping) -> new dictionary initialized from a mapping object's\n" -" (key, value) pairs.\n" -"dict(seq) -> new dictionary initialized as if via:\n" +" (key, value) pairs\n" +"dict(iterable) -> new dictionary initialized as if via:\n" " d = {}\n" -" for k, v in seq:\n" +" for k, v in iterable:\n" " d[k] = v\n" "dict(**kwargs) -> new dictionary initialized with the name=value pairs\n" " in the keyword argument list. For example: dict(one=1, two=2)"); |