summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-12-19 21:20:55 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-12-19 21:20:55 (GMT)
commit188aace8d87f1242bad49089be6cbc83c929acb6 (patch)
tree9f2290f3bf275fd0c0ac85ae1d1ba25abfc29cbe
parent45a437269edb8c9d5bee135c1f57ba2f637909e1 (diff)
downloadcpython-188aace8d87f1242bad49089be6cbc83c929acb6.zip
cpython-188aace8d87f1242bad49089be6cbc83c929acb6.tar.gz
cpython-188aace8d87f1242bad49089be6cbc83c929acb6.tar.bz2
Merged revisions 76902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76902 | mark.dickinson | 2009-12-19 21:19:35 +0000 (Sat, 19 Dec 2009) | 1 line Fix typo (reported by terlop on IRC) ........
-rw-r--r--Python/bltinmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 7953297..e03b49f 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -804,7 +804,7 @@ builtin_exec(PyObject *self, PyObject *args)
PyDoc_STRVAR(exec_doc,
"exec(object[, globals[, locals]])\n\
\n\
-Read and execute code from a object, which can be a string or a code\n\
+Read and execute code from an object, which can be a string or a code\n\
object.\n\
The globals and locals are dictionaries, defaulting to the current\n\
globals and locals. If only globals is given, locals defaults to it.");