Skip to content

Commit d2068c6

Browse files
authored
[3.12] gh-101100: Add a table of class attributes to the "Custom classes" section of the data model docs (#124480) (#124558)
1 parent ea5c650 commit d2068c6

39 files changed

+225
-181
lines changed

Doc/c-api/exceptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ Exception Classes
720720
This creates a class object derived from :exc:`Exception` (accessible in C as
721721
:c:data:`PyExc_Exception`).
722722
723-
The :attr:`!__module__` attribute of the new class is set to the first part (up
723+
The :attr:`~type.__module__` attribute of the new class is set to the first part (up
724724
to the last dot) of the *name* argument, and the class name is set to the last
725725
part (after the last dot). The *base* argument can be used to specify alternate
726726
base classes; it can either be only one class or a tuple of classes. The *dict*

Doc/c-api/object.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,14 @@ Object Protocol
253253
The result will be ``1`` when at least one of the checks returns ``1``,
254254
otherwise it will be ``0``.
255255
256-
If *cls* has a :meth:`~class.__subclasscheck__` method, it will be called to
256+
If *cls* has a :meth:`~type.__subclasscheck__` method, it will be called to
257257
determine the subclass status as described in :pep:`3119`. Otherwise,
258258
*derived* is a subclass of *cls* if it is a direct or indirect subclass,
259-
i.e. contained in ``cls.__mro__``.
259+
i.e. contained in :attr:`cls.__mro__ <type.__mro__>`.
260260
261261
Normally only class objects, i.e. instances of :class:`type` or a derived
262262
class, are considered classes. However, objects can override this by having
263-
a :attr:`~class.__bases__` attribute (which must be a tuple of base classes).
263+
a :attr:`~type.__bases__` attribute (which must be a tuple of base classes).
264264
265265
266266
.. c:function:: int PyObject_IsInstance(PyObject *inst, PyObject *cls)
@@ -272,15 +272,15 @@ Object Protocol
272272
The result will be ``1`` when at least one of the checks returns ``1``,
273273
otherwise it will be ``0``.
274274
275-
If *cls* has a :meth:`~class.__instancecheck__` method, it will be called to
275+
If *cls* has a :meth:`~type.__instancecheck__` method, it will be called to
276276
determine the subclass status as described in :pep:`3119`. Otherwise, *inst*
277277
is an instance of *cls* if its class is a subclass of *cls*.
278278
279279
An instance *inst* can override what is considered its class by having a
280-
:attr:`~instance.__class__` attribute.
280+
:attr:`~object.__class__` attribute.
281281
282282
An object *cls* can override if it is considered a class, and what its base
283-
classes are, by having a :attr:`~class.__bases__` attribute (which must be a tuple
283+
classes are, by having a :attr:`~type.__bases__` attribute (which must be a tuple
284284
of base classes).
285285
286286

Doc/c-api/type.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Type Objects
5353
.. c:function:: PyObject* PyType_GetDict(PyTypeObject* type)
5454
5555
Return the type object's internal namespace, which is otherwise only
56-
exposed via a read-only proxy (``cls.__dict__``). This is a
56+
exposed via a read-only proxy (:attr:`cls.__dict__ <type.__dict__>`).
57+
This is a
5758
replacement for accessing :c:member:`~PyTypeObject.tp_dict` directly.
5859
The returned dictionary must be treated as read-only.
5960
@@ -140,7 +141,7 @@ Type Objects
140141
Return true if *a* is a subtype of *b*.
141142
142143
This function only checks for actual subtypes, which means that
143-
:meth:`~class.__subclasscheck__` is not called on *b*. Call
144+
:meth:`~type.__subclasscheck__` is not called on *b*. Call
144145
:c:func:`PyObject_IsSubclass` to do the same check that :func:`issubclass`
145146
would do.
146147
@@ -174,14 +175,15 @@ Type Objects
174175
175176
.. c:function:: PyObject* PyType_GetName(PyTypeObject *type)
176177
177-
Return the type's name. Equivalent to getting the type's ``__name__`` attribute.
178+
Return the type's name. Equivalent to getting the type's
179+
:attr:`~type.__name__` attribute.
178180
179181
.. versionadded:: 3.11
180182
181183
.. c:function:: PyObject* PyType_GetQualName(PyTypeObject *type)
182184
183185
Return the type's qualified name. Equivalent to getting the
184-
type's ``__qualname__`` attribute.
186+
type's :attr:`~type.__qualname__` attribute.
185187
186188
.. versionadded:: 3.11
187189

Doc/c-api/typeobj.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -589,12 +589,12 @@ and :c:data:`PyType_Type` effectively act as defaults.)
589589

590590
For :ref:`statically allocated type objects <static-types>`,
591591
the *tp_name* field should contain a dot.
592-
Everything before the last dot is made accessible as the :attr:`__module__`
592+
Everything before the last dot is made accessible as the :attr:`~type.__module__`
593593
attribute, and everything after the last dot is made accessible as the
594-
:attr:`~definition.__name__` attribute.
594+
:attr:`~type.__name__` attribute.
595595

596596
If no dot is present, the entire :c:member:`~PyTypeObject.tp_name` field is made accessible as the
597-
:attr:`~definition.__name__` attribute, and the :attr:`__module__` attribute is undefined
597+
:attr:`~type.__name__` attribute, and the :attr:`~type.__module__` attribute is undefined
598598
(unless explicitly set in the dictionary, as explained above). This means your
599599
type will be impossible to pickle. Additionally, it will not be listed in
600600
module documentations created with pydoc.
@@ -1149,7 +1149,7 @@ and :c:data:`PyType_Type` effectively act as defaults.)
11491149

11501150
.. c:macro:: Py_TPFLAGS_MANAGED_DICT
11511151
1152-
This bit indicates that instances of the class have a ``__dict__``
1152+
This bit indicates that instances of the class have a `~object.__dict__`
11531153
attribute, and that the space for the dictionary is managed by the VM.
11541154

11551155
If this flag is set, :c:macro:`Py_TPFLAGS_HAVE_GC` should also be set.
@@ -1350,8 +1350,8 @@ and :c:data:`PyType_Type` effectively act as defaults.)
13501350
.. c:member:: const char* PyTypeObject.tp_doc
13511351
13521352
An optional pointer to a NUL-terminated C string giving the docstring for this
1353-
type object. This is exposed as the :attr:`__doc__` attribute on the type and
1354-
instances of the type.
1353+
type object. This is exposed as the :attr:`~type.__doc__` attribute on the
1354+
type and instances of the type.
13551355

13561356
**Inheritance:**
13571357

@@ -2028,7 +2028,7 @@ and :c:data:`PyType_Type` effectively act as defaults.)
20282028
A collection of subclasses. Internal use only. May be an invalid pointer.
20292029

20302030
To get a list of subclasses, call the Python method
2031-
:py:meth:`~class.__subclasses__`.
2031+
:py:meth:`~type.__subclasses__`.
20322032

20332033
.. versionchanged:: 3.12
20342034

Doc/extending/newtypes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ An interesting advantage of using the :c:member:`~PyTypeObject.tp_members` table
296296
descriptors that are used at runtime is that any attribute defined this way can
297297
have an associated doc string simply by providing the text in the table. An
298298
application can use the introspection API to retrieve the descriptor from the
299-
class object, and get the doc string using its :attr:`!__doc__` attribute.
299+
class object, and get the doc string using its :attr:`~type.__doc__` attribute.
300300

301301
As with the :c:member:`~PyTypeObject.tp_methods` table, a sentinel entry with a :c:member:`~PyMethodDef.ml_name` value
302302
of ``NULL`` is required.

Doc/extending/newtypes_tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ only used for variable-sized objects and should otherwise be zero.
144144
If you want your type to be subclassable from Python, and your type has the same
145145
:c:member:`~PyTypeObject.tp_basicsize` as its base type, you may have problems with multiple
146146
inheritance. A Python subclass of your type will have to list your type first
147-
in its :attr:`~class.__bases__`, or else it will not be able to call your type's
147+
in its :attr:`~type.__bases__`, or else it will not be able to call your type's
148148
:meth:`~object.__new__` method without getting an error. You can avoid this problem by
149149
ensuring that your type has a larger value for :c:member:`~PyTypeObject.tp_basicsize` than its
150150
base type does. Most of the time, this will be true anyway, because either your

Doc/faq/programming.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ method too, and it must do so carefully. The basic implementation of
16141614
...
16151615

16161616
Most :meth:`!__setattr__` implementations must modify
1617-
:meth:`self.__dict__ <object.__dict__>` to store
1617+
:attr:`self.__dict__ <object.__dict__>` to store
16181618
local state for self without causing an infinite recursion.
16191619

16201620

Doc/glossary.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ Glossary
350350
docstring
351351
A string literal which appears as the first expression in a class,
352352
function or module. While ignored when the suite is executed, it is
353-
recognized by the compiler and put into the :attr:`!__doc__` attribute
353+
recognized by the compiler and put into the :attr:`~definition.__doc__` attribute
354354
of the enclosing class, function or module. Since it is available via
355355
introspection, it is the canonical place for documentation of the
356356
object.
@@ -1201,7 +1201,7 @@ Glossary
12011201
type
12021202
The type of a Python object determines what kind of object it is; every
12031203
object has a type. An object's type is accessible as its
1204-
:attr:`~instance.__class__` attribute or can be retrieved with
1204+
:attr:`~object.__class__` attribute or can be retrieved with
12051205
``type(obj)``.
12061206

12071207
type alias

Doc/howto/annotations.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ Your code will have to have a separate code path if the object
102102
you're examining is a class (``isinstance(o, type)``).
103103
In that case, best practice relies on an implementation detail
104104
of Python 3.9 and before: if a class has annotations defined,
105-
they are stored in the class's ``__dict__`` dictionary. Since
105+
they are stored in the class's :attr:`~type.__dict__` dictionary. Since
106106
the class may or may not have annotations defined, best practice
107-
is to call the ``get`` method on the class dict.
107+
is to call the :meth:`~dict.get` method on the class dict.
108108

109109
To put it all together, here is some sample code that safely
110110
accesses the ``__annotations__`` attribute on an arbitrary
@@ -121,8 +121,8 @@ the type of ``ann`` using :func:`isinstance` before further
121121
examination.
122122

123123
Note that some exotic or malformed type objects may not have
124-
a ``__dict__`` attribute, so for extra safety you may also wish
125-
to use :func:`getattr` to access ``__dict__``.
124+
a :attr:`~type.__dict__` attribute, so for extra safety you may also wish
125+
to use :func:`getattr` to access :attr:`!__dict__`.
126126

127127

128128
Manually Un-Stringizing Stringized Annotations

Doc/howto/descriptor.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ attribute access.
559559

560560
The expression ``obj.x`` looks up the attribute ``x`` in the chain of
561561
namespaces for ``obj``. If the search finds a descriptor outside of the
562-
instance ``__dict__``, its :meth:`__get__` method is invoked according to the
563-
precedence rules listed below.
562+
instance :attr:`~object.__dict__`, its :meth:`~object.__get__` method is
563+
invoked according to the precedence rules listed below.
564564

565565
The details of invocation depend on whether ``obj`` is an object, class, or
566566
instance of super.

0 commit comments

Comments
 (0)