summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-18 05:04:07 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-18 05:04:07 (GMT)
commite83236f396b39f58e09d012d4a73ccb044f4c350 (patch)
tree86df36cbad6ef22d9f8a9c6a4bc4a92b63c12543 /Python
parentaf7c5b0bb556c33d0d4b710ae1c5477abf7fc0d8 (diff)
parent5edbb7b7a431226488eb8bedf404d96b190d76cf (diff)
downloadcpython-e83236f396b39f58e09d012d4a73ccb044f4c350.zip
cpython-e83236f396b39f58e09d012d4a73ccb044f4c350.tar.gz
cpython-e83236f396b39f58e09d012d4a73ccb044f4c350.tar.bz2
merge 3.4
Diffstat (limited to 'Python')
-rw-r--r--Python/bltinmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 745457f..8d1255e 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1325,7 +1325,7 @@ builtin_len(PyObject *self, PyObject *v)
}
PyDoc_STRVAR(len_doc,
-"len(module, object)\n\
+"len(object)\n\
\n\
Return the number of items of a sequence or mapping.");