Commit eb3aa564 authored by Fred Drake's avatar Fred Drake

A number of small adjustments.

parent f09b5a72
...@@ -1370,7 +1370,7 @@ against an object's buffer interface, returning data from the target ...@@ -1370,7 +1370,7 @@ against an object's buffer interface, returning data from the target
object. object.
More information on the buffer interface is provided in the section More information on the buffer interface is provided in the section
``Buffer Object Structures'' (section \ref{buffer-structs}), under ``Buffer Object Structures'' (section~\ref{buffer-structs}), under
the description for \ctype{PyBufferProcs}\ttindex{PyBufferProcs}. the description for \ctype{PyBufferProcs}\ttindex{PyBufferProcs}.
A ``buffer object'' is defined in the \file{bufferobject.h} header A ``buffer object'' is defined in the \file{bufferobject.h} header
...@@ -1857,6 +1857,7 @@ def PyDict_MergeFromSeq2(a, seq2, override): ...@@ -1857,6 +1857,7 @@ def PyDict_MergeFromSeq2(a, seq2, override):
\versionadded{2.2} \versionadded{2.2}
\end{cfuncdesc} \end{cfuncdesc}
\section{Other Objects \label{otherObjects}} \section{Other Objects \label{otherObjects}}
\subsection{File Objects \label{fileObjects}} \subsection{File Objects \label{fileObjects}}
...@@ -2188,8 +2189,11 @@ returned. ...@@ -2188,8 +2189,11 @@ returned.
\subsection{Descriptor Objects \label{descriptor-objects}} \subsection{Descriptor Objects \label{descriptor-objects}}
``Descriptors'' are objects that describe some attribute of an object.
They are found in the dictionary of type objects.
\begin{cvardesc}{PyTypeObject}{PyProperty_Type} \begin{cvardesc}{PyTypeObject}{PyProperty_Type}
The type object for a descriptor. The type object for the built-in descriptor types.
\versionadded{2.2} \versionadded{2.2}
\end{cvardesc} \end{cvardesc}
...@@ -2323,7 +2327,7 @@ acts as a proxy for the original object as much as it can. ...@@ -2323,7 +2327,7 @@ acts as a proxy for the original object as much as it can.
\obindex{CObject} \obindex{CObject}
Refer to \emph{Extending and Embedding the Python Interpreter}, Refer to \emph{Extending and Embedding the Python Interpreter},
section 1.12 (``Providing a C API for an Extension Module), for more section~1.12, ``Providing a C API for an Extension Module,'' for more
information on using these objects. information on using these objects.
...@@ -2341,7 +2345,7 @@ information on using these objects. ...@@ -2341,7 +2345,7 @@ information on using these objects.
\end{cfuncdesc} \end{cfuncdesc}
\begin{cfuncdesc}{PyObject*}{PyCObject_FromVoidPtr}{void* cobj, \begin{cfuncdesc}{PyObject*}{PyCObject_FromVoidPtr}{void* cobj,
void (*destr)(void *)} void (*destr)(void *)}
Creates a \ctype{PyCObject} from the \code{void *}\var{cobj}. The Creates a \ctype{PyCObject} from the \code{void *}\var{cobj}. The
\var{destr} function will be called when the object is reclaimed, \var{destr} function will be called when the object is reclaimed,
unless it is \NULL. unless it is \NULL.
...@@ -2378,6 +2382,10 @@ itself. This de-referencing of the cell object requires support from ...@@ -2378,6 +2382,10 @@ itself. This de-referencing of the cell object requires support from
the generated byte-code; these are not automatically de-referenced the generated byte-code; these are not automatically de-referenced
when accessed. Cell objects are not likely to be useful elsewhere. when accessed. Cell objects are not likely to be useful elsewhere.
\begin{ctypedesc}{PyCellObject}
The C structure used for cell objects.
\end{ctypedesc}
\begin{cvardesc}{PyTypeObject}{PyCell_Type} \begin{cvardesc}{PyTypeObject}{PyCell_Type}
The type object corresponding to cell objects The type object corresponding to cell objects
\end{cvardesc} \end{cvardesc}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment