[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19910)
benjamin.peterson
python-checkins at python.org
Sat Dec 7 02:14:59 CET 2013
http://hg.python.org/cpython/rev/44dacafdd48a
changeset: 87805:44dacafdd48a
parent: 87803:8001f0dfe84f
parent: 87804:500cc1acc42f
user: Benjamin Peterson <benjamin at python.org>
date: Fri Dec 06 20:12:51 2013 -0500
summary:
merge 3.3 (#19910)
files:
Doc/library/functions.rst | 6 +++---
Python/bltinmodule.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -193,9 +193,9 @@
.. function:: compile(source, filename, mode, flags=0, dont_inherit=False, optimize=-1)
Compile the *source* into a code or AST object. Code objects can be executed
- by :func:`exec` or :func:`eval`. *source* can either be a string or an AST
- object. Refer to the :mod:`ast` module documentation for information on how
- to work with AST objects.
+ by :func:`exec` or :func:`eval`. *source* can either be a normal string, a
+ byte string, or an AST object. Refer to the :mod:`ast` module documentation
+ for information on how to work with AST objects.
The *filename* argument should give the file from which the code was read;
pass some recognizable value if it wasn't read from a file (``'<string>'`` is
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -695,7 +695,7 @@
PyDoc_STRVAR(compile_doc,
"compile(source, filename, mode[, flags[, dont_inherit]]) -> code object\n\
\n\
-Compile the source string (a Python module, statement or expression)\n\
+Compile the source (a Python module, statement or expression)\n\
into a code object that can be executed by exec() or eval().\n\
The filename will be used for run-time error messages.\n\
The mode must be 'exec' to compile a module, 'single' to compile a\n\
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list