diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-09 23:36:40 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-09 23:36:40 (GMT) |
| commit | 5848ac2df0169bb4a4910a3690df560cd2e77447 (patch) | |
| tree | 66baf8e53edba49fd3ed13e89cb2c67539209c13 | |
| parent | b08388d5f2e62577e1a2379deb1681af4f148811 (diff) | |
| parent | e9b8403a1f5c4ecd199d1f0a03a49b6684a6b707 (diff) | |
| download | cpython-5848ac2df0169bb4a4910a3690df560cd2e77447.zip cpython-5848ac2df0169bb4a4910a3690df560cd2e77447.tar.gz cpython-5848ac2df0169bb4a4910a3690df560cd2e77447.tar.bz2 | |
Issue #15476: Merge index entries from 3.5
| -rw-r--r-- | Doc/c-api/code.rst | 6 | ||||
| -rw-r--r-- | Doc/library/marshal.rst | 3 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 4 | ||||
| -rw-r--r-- | Doc/reference/datamodel.rst | 6 |
4 files changed, 8 insertions, 11 deletions
diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst index 9c93563..10d89f2 100644 --- a/Doc/c-api/code.rst +++ b/Doc/c-api/code.rst @@ -2,15 +2,13 @@ .. _codeobjects: +.. index:: object; code, code object + Code Objects ------------ .. sectionauthor:: Jeffrey Yasskin <jyasskin@gmail.com> - -.. index:: - object: code - Code objects are a low-level detail of the CPython implementation. Each one represents a chunk of executable code that hasn't yet been bound into a function. diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst index d9fd68a..8bf0e03 100644 --- a/Doc/library/marshal.rst +++ b/Doc/library/marshal.rst @@ -16,7 +16,6 @@ rarely does). [#]_ .. index:: module: pickle module: shelve - object: code This is not a general "persistence" module. For general persistence and transfer of Python objects through RPC calls, see the modules :mod:`pickle` and @@ -34,6 +33,8 @@ supports a substantially wider range of objects than marshal. maliciously constructed data. Never unmarshal data received from an untrusted or unauthenticated source. +.. index:: object; code, code object + Not all Python object types are supported; in general, only objects whose value is independent from a particular invocation of Python can be written and read by this module. The following types are supported: booleans, integers, floating diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 33bd7a1..5baa4bf 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -4437,13 +4437,13 @@ attribute, you need to explicitly set it on the underlying function object:: See :ref:`types` for more information. +.. index:: object; code, code object + .. _bltin-code-objects: Code Objects ------------ -.. index:: object: code - .. index:: builtin: compile single: __code__ (function object attribute) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 78b59f3..c707452 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -846,11 +846,9 @@ Internal types definitions may change with future versions of the interpreter, but they are mentioned here for completeness. - Code objects - .. index:: - single: bytecode - object: code + .. index:: bytecode, object; code, code object + Code objects Code objects represent *byte-compiled* executable Python code, or :term:`bytecode`. The difference between a code object and a function object is that the function object contains an explicit reference to the function's globals (the module in |