diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-12-07 01:12:51 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-12-07 01:12:51 (GMT) |
commit | d45a46b60d2dc4616d681567d32482a1ad2c8c0c (patch) | |
tree | 6dec0e2114ae2cee43974410e8e1068cf15327e9 | |
parent | 9bcb1127f1d1305cc8071f8b4460af3b34f3ec74 (diff) | |
parent | 933142a8f238529c610edf2100c4208a8ee82805 (diff) | |
download | cpython-d45a46b60d2dc4616d681567d32482a1ad2c8c0c.zip cpython-d45a46b60d2dc4616d681567d32482a1ad2c8c0c.tar.gz cpython-d45a46b60d2dc4616d681567d32482a1ad2c8c0c.tar.bz2 |
merge 3.3 (#19910)
-rw-r--r-- | Doc/library/functions.rst | 6 | ||||
-rw-r--r-- | Python/bltinmodule.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index fb4fc7f..4371969 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -193,9 +193,9 @@ are always available. They are listed here in alphabetical order. .. 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 index 057ab47..e3157d0 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -695,7 +695,7 @@ finally: 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\ |