From fca48efeb15dd56f46a3e4f27e6bc60793e6a183 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sat, 2 Oct 2010 03:29:31 +0000 Subject: [PATCH] Merged revisions 85156 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85156 | senthil.kumaran | 2010-10-02 08:46:04 +0530 (Sat, 02 Oct 2010) | 3 lines Fix - issue10010 .. index:: position in the docs. ........ --- Doc/library/stdtypes.rst | 34 +++++++++++++++++----------------- Doc/reference/datamodel.rst | 32 ++++++++++++++++---------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 45c76518a8a..28621048262 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1499,6 +1499,23 @@ also support these operations. Strings and tuples are immutable sequence types: such objects cannot be modified once created. The following operations are defined on mutable sequence types (where *x* is an arbitrary object): +.. index:: + triple: operations on; sequence; types + triple: operations on; list; type + pair: subscript; assignment + pair: slice; assignment + pair: extended slice; assignment + statement: del + single: append() (list method) + single: extend() (list method) + single: count() (list method) + single: index() (list method) + single: insert() (list method) + single: pop() (list method) + single: remove() (list method) + single: reverse() (list method) + single: sort() (list method) + +------------------------------+--------------------------------+---------------------+ | Operation | Result | Notes | +==============================+================================+=====================+ @@ -1544,23 +1561,6 @@ defined on mutable sequence types (where *x* is an arbitrary object): | reverse]]])`` | | | +------------------------------+--------------------------------+---------------------+ -.. index:: - triple: operations on; sequence; types - triple: operations on; list; type - pair: subscript; assignment - pair: slice; assignment - pair: extended slice; assignment - statement: del - single: append() (list method) - single: extend() (list method) - single: count() (list method) - single: index() (list method) - single: insert() (list method) - single: pop() (list method) - single: remove() (list method) - single: reverse() (list method) - single: sort() (list method) - Notes: (1) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 2afc3ad752b..8751a0e6e31 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -908,6 +908,22 @@ Internal types objects, code objects are immutable and contain no references (directly or indirectly) to mutable objects. + .. index:: + single: co_argcount (code object attribute) + single: co_code (code object attribute) + single: co_consts (code object attribute) + single: co_filename (code object attribute) + single: co_firstlineno (code object attribute) + single: co_flags (code object attribute) + single: co_lnotab (code object attribute) + single: co_name (code object attribute) + single: co_names (code object attribute) + single: co_nlocals (code object attribute) + single: co_stacksize (code object attribute) + single: co_varnames (code object attribute) + single: co_cellvars (code object attribute) + single: co_freevars (code object attribute) + Special read-only attributes: :attr:`co_name` gives the function name; :attr:`co_argcount` is the number of positional arguments (including arguments with default values); :attr:`co_nlocals` is the number of local variables used @@ -925,22 +941,6 @@ Internal types :attr:`co_stacksize` is the required stack size (including local variables); :attr:`co_flags` is an integer encoding a number of flags for the interpreter. - .. index:: - single: co_argcount (code object attribute) - single: co_code (code object attribute) - single: co_consts (code object attribute) - single: co_filename (code object attribute) - single: co_firstlineno (code object attribute) - single: co_flags (code object attribute) - single: co_lnotab (code object attribute) - single: co_name (code object attribute) - single: co_names (code object attribute) - single: co_nlocals (code object attribute) - single: co_stacksize (code object attribute) - single: co_varnames (code object attribute) - single: co_cellvars (code object attribute) - single: co_freevars (code object attribute) - .. index:: object: generator The following flag bits are defined for :attr:`co_flags`: bit ``0x04`` is set if