[Python-checkins] cpython (merge default -> default): Merge
brett.cannon
python-checkins at python.org
Thu Jun 9 19:59:20 EDT 2016
https://hg.python.org/cpython/rev/808b2e681700
changeset: 101834:808b2e681700
parent: 101833:cec1f00c538d
parent: 101831:8455bbc6b4f2
user: Brett Cannon <brett at python.org>
date: Thu Jun 09 16:59:13 2016 -0700
summary:
Merge
files:
Doc/c-api/code.rst | 6 ++----
Doc/library/marshal.rst | 3 ++-
Doc/library/stdtypes.rst | 4 ++--
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
--- 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 at 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
--- a/Doc/library/marshal.rst
+++ b/Doc/library/marshal.rst
@@ -16,7 +16,6 @@
.. 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 @@
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
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -4437,13 +4437,13 @@
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
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -846,11 +846,9 @@
definitions may change with future versions of the interpreter, but they are
mentioned here for completeness.
+ .. index:: bytecode, object; code, code object
+
Code objects
- .. index::
- single: bytecode
- object: code
-
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list