summaryrefslogtreecommitdiffstats
path: root/Objects/tupleobject.c
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-03-01 04:05:56 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-03-01 04:05:56 (GMT)
commit56f1682a4462559b735c01c6cb8c06fd1afdc11b (patch)
treee8bfeb61a246a2fd44cb37b1e5ee75470aca3b48 /Objects/tupleobject.c
parentc5e62796f9fbcfa4a5c172c7dd870102fd959d6b (diff)
downloadcpython-56f1682a4462559b735c01c6cb8c06fd1afdc11b.zip
cpython-56f1682a4462559b735c01c6cb8c06fd1afdc11b.tar.gz
cpython-56f1682a4462559b735c01c6cb8c06fd1afdc11b.tar.bz2
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/tupleobject.c')
-rw-r--r--Objects/tupleobject.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index b1a7003..92fc1f4 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -630,10 +630,10 @@ tuple_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
}
PyDoc_STRVAR(tuple_doc,
-"tuple() -> an empty tuple\n"
-"tuple(sequence) -> tuple initialized from sequence's items\n"
-"\n"
-"If the argument is a tuple, the return value is the same object.");
+"tuple() -> empty tuple\n\
+tuple(iterable) -> tuple initialized from iterable's items\n\
+\n\
+If the argument is a tuple, the return value is the same object.");
static PySequenceMethods tuple_as_sequence = {
(lenfunc)tuplelength, /* sq_length */