summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTommy Beadle <tbeadle@gmail.com>2016-06-02 19:26:51 -0400
committerTommy Beadle <tbeadle@gmail.com>2016-06-02 19:26:51 -0400
commit171ab682f743390b5384ee2384c20c8ed41ff657 (patch)
treed736556978a4d6e140d6a37b89bfc04da79ef73e
parentd938c575732c46c86c25db9bb3a322cfdeeaf5eb (diff)
downloadcpython-171ab682f743390b5384ee2384c20c8ed41ff657.tar.gz
[Issue 15476] Make "code object" its own entry in the index
-rw-r--r--Doc/c-api/code.rst6
-rw-r--r--Doc/library/marshal.rst3
-rw-r--r--Doc/library/stdtypes.rst4
-rw-r--r--Doc/reference/datamodel.rst6
4 files changed, 8 insertions, 11 deletions
diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
index 9c93563382..10d89f297c 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 d9fd68ada9..8bf0e0322a 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 80f47793be..e8a488eb1b 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -4436,13 +4436,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 493acaaa49..71d695f96f 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