summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-28 18:19:17 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-28 18:19:17 (GMT)
commitbca1169e94f81b140629ae69ce2ab33628d26b08 (patch)
tree6f5f7e79c639fc8523800353aa7b542b0189f932
parent68beef66335707f8d0daac208dcf56bfcece8315 (diff)
downloadcpython-bca1169e94f81b140629ae69ce2ab33628d26b08.zip
cpython-bca1169e94f81b140629ae69ce2ab33628d26b08.tar.gz
cpython-bca1169e94f81b140629ae69ce2ab33628d26b08.tar.bz2
#8030: make builtin type docstrings more consistent: use "iterable" instead of "seq(uence)", use "new" to show that set() always returns a new object.
-rw-r--r--Objects/dictobject.c4
-rw-r--r--Objects/listobject.c2
-rw-r--r--Objects/setobject.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index b20d6f3..517c20c 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2330,9 +2330,9 @@ PyDoc_STRVAR(dictionary_doc,
"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"
+"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)");
diff --git a/Objects/listobject.c b/Objects/listobject.c
index c55524d..d710374 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2537,7 +2537,7 @@ static PySequenceMethods list_as_sequence = {
PyDoc_STRVAR(list_doc,
"list() -> new list\n"
-"list(sequence) -> new list initialized from sequence's items");
+"list(iterable) -> new list initialized from iterable's items");
static PyObject *
diff --git a/Objects/setobject.c b/Objects/setobject.c
index 81fd315..45a9afc 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -2102,7 +2102,7 @@ static PyNumberMethods set_as_number = {
};
PyDoc_STRVAR(set_doc,
-"set(iterable) --> set object\n\
+"set(iterable) -> new set object\n\
\n\
Build an unordered collection of unique elements.");
@@ -2200,7 +2200,7 @@ static PyNumberMethods frozenset_as_number = {
};
PyDoc_STRVAR(frozenset_doc,
-"frozenset(iterable) --> frozenset object\n\
+"frozenset(iterable) -> frozenset object\n\
\n\
Build an immutable unordered collection of unique elements.");