summaryrefslogtreecommitdiffstats
path: root/Doc/api
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-12-11 19:40:16 (GMT)
committerFred Drake <fdrake@acm.org>2001-12-11 19:40:16 (GMT)
commit54e629419738bb12650428174e2d908cf150e4f7 (patch)
treefe65fee89d64125474d830f46fd23cca211c8eda /Doc/api
parent017052152befb71433a434600e36a6389109546d (diff)
downloadcpython-54e629419738bb12650428174e2d908cf150e4f7.zip
cpython-54e629419738bb12650428174e2d908cf150e4f7.tar.gz
cpython-54e629419738bb12650428174e2d908cf150e4f7.tar.bz2
A number of small adjustments.
Diffstat (limited to 'Doc/api')
-rw-r--r--Doc/api/concrete.tex16
1 files changed, 12 insertions, 4 deletions
diff --git a/Doc/api/concrete.tex b/Doc/api/concrete.tex
index 038bd5f..13f1f0a 100644
--- a/Doc/api/concrete.tex
+++ b/Doc/api/concrete.tex
@@ -1370,7 +1370,7 @@ against an object's buffer interface, returning data from the target
object.
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}.
A ``buffer object'' is defined in the \file{bufferobject.h} header
@@ -1857,6 +1857,7 @@ def PyDict_MergeFromSeq2(a, seq2, override):
\versionadded{2.2}
\end{cfuncdesc}
+
\section{Other Objects \label{otherObjects}}
\subsection{File Objects \label{fileObjects}}
@@ -2188,8 +2189,11 @@ returned.
\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}
- The type object for a descriptor.
+ The type object for the built-in descriptor types.
\versionadded{2.2}
\end{cvardesc}
@@ -2323,7 +2327,7 @@ acts as a proxy for the original object as much as it can.
\obindex{CObject}
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.
@@ -2341,7 +2345,7 @@ information on using these objects.
\end{cfuncdesc}
\begin{cfuncdesc}{PyObject*}{PyCObject_FromVoidPtr}{void* cobj,
- void (*destr)(void *)}
+ void (*destr)(void *)}
Creates a \ctype{PyCObject} from the \code{void *}\var{cobj}. The
\var{destr} function will be called when the object is reclaimed,
unless it is \NULL.
@@ -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
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}
The type object corresponding to cell objects
\end{cvardesc}