diff Objects/tupleobject.c @ 59223:0265cdc8d5bb 2.6

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. ........
author Ezio Melotti <ezio.melotti@gmail.com>
date Mon, 01 Mar 2010 04:05:56 +0000
parents 2e794757bdc8
children e38335d4df91
line wrap: on
line diff
--- a/Objects/tupleobject.c	Mon Mar 01 03:11:09 2010 +0000
+++ b/Objects/tupleobject.c	Mon Mar 01 04:05:56 2010 +0000
@@ -630,10 +630,10 @@
 }
 
 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 */