Skip to content

Commit 0d196ed

Browse files
Issue #19190: Improve cross-references in builtin types and functions documentation.
1 parent 0b68a2d commit 0d196ed

File tree

5 files changed

+100
-91
lines changed

5 files changed

+100
-91
lines changed

Doc/glossary.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,9 @@ Glossary
547547
dictionaries. There are the local, global and built-in namespaces as well
548548
as nested namespaces in objects (in methods). Namespaces support
549549
modularity by preventing naming conflicts. For instance, the functions
550-
:func:`builtins.open` and :func:`os.open` are distinguished by their
551-
namespaces. Namespaces also aid readability and maintainability by making
552-
it clear which module implements a function. For instance, writing
550+
:func:`builtins.open <.open>` and :func:`os.open` are distinguished by
551+
their namespaces. Namespaces also aid readability and maintainability by
552+
making it clear which module implements a function. For instance, writing
553553
:func:`random.seed` or :func:`itertools.islice` makes it clear that those
554554
functions are implemented by the :mod:`random` and :mod:`itertools`
555555
modules, respectively.
@@ -574,8 +574,8 @@ Glossary
574574
new-style class
575575
Old name for the flavor of classes now used for all class objects. In
576576
earlier Python versions, only new-style classes could use Python's newer,
577-
versatile features like :attr:`__slots__`, descriptors, properties,
578-
:meth:`__getattribute__`, class methods, and static methods.
577+
versatile features like :attr:`~object.__slots__`, descriptors,
578+
properties, :meth:`__getattribute__`, class methods, and static methods.
579579

580580
object
581581
Any data with state (attributes or value) and defined behavior
@@ -790,7 +790,8 @@ Glossary
790790
type
791791
The type of a Python object determines what kind of object it is; every
792792
object has a type. An object's type is accessible as its
793-
:attr:`__class__` attribute or can be retrieved with ``type(obj)``.
793+
:attr:`~instance.__class__` attribute or can be retrieved with
794+
``type(obj)``.
794795

795796
universal newlines
796797
A manner of interpreting text streams in which all of the following are

Doc/library/functions.rst

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ are always available. They are listed here in alphabetical order.
219219

220220
Future statements are specified by bits which can be bitwise ORed together to
221221
specify multiple statements. The bitfield required to specify a given feature
222-
can be found as the :attr:`compiler_flag` attribute on the :class:`_Feature`
223-
instance in the :mod:`__future__` module.
222+
can be found as the :attr:`~__future__._Feature.compiler_flag` attribute on
223+
the :class:`~__future__._Feature` instance in the :mod:`__future__` module.
224224

225225
The argument *optimize* specifies the optimization level of the compiler; the
226226
default value of ``-1`` selects the optimization level of the interpreter as
@@ -707,7 +707,7 @@ are always available. They are listed here in alphabetical order.
707707

708708
One useful application of the second form of :func:`iter` is to read lines of
709709
a file until a certain line is reached. The following example reads a file
710-
until the :meth:`readline` method returns an empty string::
710+
until the :meth:`~io.TextIOBase.readline` method returns an empty string::
711711

712712
with open('mydata.txt') as fp:
713713
for line in iter(fp.readline, ''):
@@ -810,8 +810,8 @@ are always available. They are listed here in alphabetical order.
810810

811811
.. note::
812812

813-
:class:`object` does *not* have a :attr:`__dict__`, so you can't assign
814-
arbitrary attributes to an instance of the :class:`object` class.
813+
:class:`object` does *not* have a :attr:`~object.__dict__`, so you can't
814+
assign arbitrary attributes to an instance of the :class:`object` class.
815815

816816

817817
.. function:: oct(x)
@@ -889,9 +889,9 @@ are always available. They are listed here in alphabetical order.
889889
size" and falling back on :attr:`io.DEFAULT_BUFFER_SIZE`. On many systems,
890890
the buffer will typically be 4096 or 8192 bytes long.
891891

892-
* "Interactive" text files (files for which :meth:`isatty` returns True) use
893-
line buffering. Other text files use the policy described above for binary
894-
files.
892+
* "Interactive" text files (files for which :meth:`~io.IOBase.isatty`
893+
returns True) use line buffering. Other text files use the policy
894+
described above for binary files.
895895

896896
*encoding* is the name of the encoding used to decode or encode the file.
897897
This should only be used in text mode. The default encoding is platform
@@ -1096,10 +1096,10 @@ are always available. They are listed here in alphabetical order.
10961096
turns the :meth:`voltage` method into a "getter" for a read-only attribute
10971097
with the same name.
10981098

1099-
A property object has :attr:`getter`, :attr:`setter`, and :attr:`deleter`
1100-
methods usable as decorators that create a copy of the property with the
1101-
corresponding accessor function set to the decorated function. This is
1102-
best explained with an example::
1099+
A property object has :attr:`~property.getter`, :attr:`~property.setter`,
1100+
and :attr:`~property.deleter` methods usable as decorators that create a
1101+
copy of the property with the corresponding accessor function set to the
1102+
decorated function. This is best explained with an example::
11031103

11041104
class C:
11051105
def __init__(self):
@@ -1205,13 +1205,13 @@ are always available. They are listed here in alphabetical order.
12051205

12061206
Return a :term:`slice` object representing the set of indices specified by
12071207
``range(start, stop, step)``. The *start* and *step* arguments default to
1208-
``None``. Slice objects have read-only data attributes :attr:`start`,
1209-
:attr:`stop` and :attr:`step` which merely return the argument values (or their
1210-
default). They have no other explicit functionality; however they are used by
1211-
Numerical Python and other third party extensions. Slice objects are also
1212-
generated when extended indexing syntax is used. For example:
1213-
``a[start:stop:step]`` or ``a[start:stop, i]``. See :func:`itertools.islice`
1214-
for an alternate version that returns an iterator.
1208+
``None``. Slice objects have read-only data attributes :attr:`~slice.start`,
1209+
:attr:`~slice.stop` and :attr:`~slice.step` which merely return the argument
1210+
values (or their default). They have no other explicit functionality;
1211+
however they are used by Numerical Python and other third party extensions.
1212+
Slice objects are also generated when extended indexing syntax is used. For
1213+
example: ``a[start:stop:step]`` or ``a[start:stop, i]``. See
1214+
:func:`itertools.islice` for an alternate version that returns an iterator.
12151215

12161216

12171217
.. function:: sorted(iterable[, key][, reverse])
@@ -1291,9 +1291,10 @@ are always available. They are listed here in alphabetical order.
12911291
been overridden in a class. The search order is same as that used by
12921292
:func:`getattr` except that the *type* itself is skipped.
12931293

1294-
The :attr:`__mro__` attribute of the *type* lists the method resolution
1295-
search order used by both :func:`getattr` and :func:`super`. The attribute
1296-
is dynamic and can change whenever the inheritance hierarchy is updated.
1294+
The :attr:`~class.__mro__` attribute of the *type* lists the method
1295+
resolution search order used by both :func:`getattr` and :func:`super`. The
1296+
attribute is dynamic and can change whenever the inheritance hierarchy is
1297+
updated.
12971298

12981299
If the second argument is omitted, the super object returned is unbound. If
12991300
the second argument is an object, ``isinstance(obj, type)`` must be true. If
@@ -1356,19 +1357,20 @@ are always available. They are listed here in alphabetical order.
13561357

13571358

13581359
With one argument, return the type of an *object*. The return value is a
1359-
type object and generally the same object as returned by ``object.__class__``.
1360+
type object and generally the same object as returned by
1361+
:attr:`object.__class__ <instance.__class__>`.
13601362

13611363
The :func:`isinstance` built-in function is recommended for testing the type
13621364
of an object, because it takes subclasses into account.
13631365

13641366

13651367
With three arguments, return a new type object. This is essentially a
13661368
dynamic form of the :keyword:`class` statement. The *name* string is the
1367-
class name and becomes the :attr:`__name__` attribute; the *bases* tuple
1368-
itemizes the base classes and becomes the :attr:`__bases__` attribute;
1369-
and the *dict* dictionary is the namespace containing definitions for class
1370-
body and becomes the :attr:`__dict__` attribute. For example, the
1371-
following two statements create identical :class:`type` objects:
1369+
class name and becomes the :attr:`~class.__name__` attribute; the *bases*
1370+
tuple itemizes the base classes and becomes the :attr:`~class.__bases__`
1371+
attribute; and the *dict* dictionary is the namespace containing definitions
1372+
for class body and becomes the :attr:`~object.__dict__` attribute. For
1373+
example, the following two statements create identical :class:`type` objects:
13721374

13731375
>>> class X:
13741376
... a = 1
@@ -1380,7 +1382,7 @@ are always available. They are listed here in alphabetical order.
13801382

13811383
.. function:: vars([object])
13821384

1383-
Return the :attr:`__dict__` attribute for a module, class, instance,
1385+
Return the :attr:`~object.__dict__` attribute for a module, class, instance,
13841386
or any other object with a :attr:`__dict__` attribute.
13851387

13861388
Objects such as modules and instances have an updateable :attr:`__dict__`

Doc/library/stdtypes.rst

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ Notes:
339339
pair: C; language
340340

341341
Conversion from floating point to integer may round or truncate
342-
as in C; see functions :func:`floor` and :func:`ceil` in the :mod:`math` module
343-
for well-defined conversions.
342+
as in C; see functions :func:`math.floor` and :func:`math.ceil` for
343+
well-defined conversions.
344344

345345
(4)
346346
float also accepts the strings "nan" and "inf" with an optional prefix "+"
@@ -631,7 +631,7 @@ efficiency across a variety of numeric types (including :class:`int`,
631631
:class:`float`, :class:`decimal.Decimal` and :class:`fractions.Fraction`)
632632
Python's hash for numeric types is based on a single mathematical function
633633
that's defined for any rational number, and hence applies to all instances of
634-
:class:`int` and :class:`fraction.Fraction`, and all finite instances of
634+
:class:`int` and :class:`fractions.Fraction`, and all finite instances of
635635
:class:`float` and :class:`decimal.Decimal`. Essentially, this function is
636636
given by reduction modulo ``P`` for a fixed prime ``P``. The value of ``P`` is
637637
made available to Python as the :attr:`modulus` attribute of
@@ -1303,7 +1303,7 @@ The advantage of the :class:`range` type over a regular :class:`list` or
13031303
only stores the ``start``, ``stop`` and ``step`` values, calculating individual
13041304
items and subranges as needed).
13051305

1306-
Range objects implement the :class:`collections.Sequence` ABC, and provide
1306+
Range objects implement the :class:`collections.abc.Sequence` ABC, and provide
13071307
features such as containment tests, element index lookup, slicing and
13081308
support for negative indices (see :ref:`typesseq`):
13091309

@@ -1326,9 +1326,9 @@ support for negative indices (see :ref:`typesseq`):
13261326
Testing range objects for equality with ``==`` and ``!=`` compares
13271327
them as sequences. That is, two range objects are considered equal if
13281328
they represent the same sequence of values. (Note that two range
1329-
objects that compare equal might have different :attr:`start`,
1330-
:attr:`stop` and :attr:`step` attributes, for example ``range(0) ==
1331-
range(2, 1, 3)`` or ``range(0, 3, 2) == range(0, 4, 2)``.)
1329+
objects that compare equal might have different :attr:`~range.start`,
1330+
:attr:`~range.stop` and :attr:`~range.step` attributes, for example
1331+
``range(0) == range(2, 1, 3)`` or ``range(0, 3, 2) == range(0, 4, 2)``.)
13321332

13331333
.. versionchanged:: 3.2
13341334
Implement the Sequence ABC.
@@ -1342,7 +1342,8 @@ range(2, 1, 3)`` or ``range(0, 3, 2) == range(0, 4, 2)``.)
13421342
object identity).
13431343

13441344
.. versionadded:: 3.3
1345-
The :attr:`start`, :attr:`stop` and :attr:`step` attributes.
1345+
The :attr:`~range.start`, :attr:`~range.stop` and :attr:`~range.step`
1346+
attributes.
13461347

13471348

13481349
.. index::
@@ -2298,7 +2299,7 @@ in the range 0 to 255 (inclusive) as well as bytes and byte array sequences.
22982299
(inclusive) as their first argument.
22992300

23002301

2301-
Each bytes and bytearray instance provides a :meth:`decode` convenience
2302+
Each bytes and bytearray instance provides a :meth:`~bytes.decode` convenience
23022303
method that is the inverse of :meth:`str.encode`:
23032304

23042305
.. method:: bytes.decode(encoding="utf-8", errors="strict")
@@ -2805,11 +2806,11 @@ other sequence-like behavior.
28052806

28062807
There are currently two built-in set types, :class:`set` and :class:`frozenset`.
28072808
The :class:`set` type is mutable --- the contents can be changed using methods
2808-
like :meth:`add` and :meth:`remove`. Since it is mutable, it has no hash value
2809-
and cannot be used as either a dictionary key or as an element of another set.
2810-
The :class:`frozenset` type is immutable and :term:`hashable` --- its contents cannot be
2811-
altered after it is created; it can therefore be used as a dictionary key or as
2812-
an element of another set.
2809+
like :meth:`~set.add` and :meth:`~set.remove`. Since it is mutable, it has no
2810+
hash value and cannot be used as either a dictionary key or as an element of
2811+
another set. The :class:`frozenset` type is immutable and :term:`hashable` ---
2812+
its contents cannot be altered after it is created; it can therefore be used as
2813+
a dictionary key or as an element of another set.
28132814

28142815
Non-empty sets (not frozensets) can be created by placing a comma-separated list
28152816
of elements within braces, for example: ``{'jack', 'sjoerd'}``, in addition to the
@@ -3350,12 +3351,12 @@ statement is not, strictly speaking, an operation on a module object; ``import
33503351
foo`` does not require a module object named *foo* to exist, rather it requires
33513352
an (external) *definition* for a module named *foo* somewhere.)
33523353

3353-
A special attribute of every module is :attr:`__dict__`. This is the dictionary
3354-
containing the module's symbol table. Modifying this dictionary will actually
3355-
change the module's symbol table, but direct assignment to the :attr:`__dict__`
3356-
attribute is not possible (you can write ``m.__dict__['a'] = 1``, which defines
3357-
``m.a`` to be ``1``, but you can't write ``m.__dict__ = {}``). Modifying
3358-
:attr:`__dict__` directly is not recommended.
3354+
A special attribute of every module is :attr:`~object.__dict__`. This is the
3355+
dictionary containing the module's symbol table. Modifying this dictionary will
3356+
actually change the module's symbol table, but direct assignment to the
3357+
:attr:`__dict__` attribute is not possible (you can write
3358+
``m.__dict__['a'] = 1``, which defines ``m.a`` to be ``1``, but you can't write
3359+
``m.__dict__ = {}``). Modifying :attr:`__dict__` directly is not recommended.
33593360

33603361
Modules built into the interpreter are written like this: ``<module 'sys'
33613362
(built-in)>``. If loaded from a file, they are written as ``<module 'os' from
@@ -3590,7 +3591,7 @@ types, where they are relevant. Some of these are not reported by the
35903591

35913592
This method can be overridden by a metaclass to customize the method
35923593
resolution order for its instances. It is called at class instantiation, and
3593-
its result is stored in :attr:`__mro__`.
3594+
its result is stored in :attr:`~class.__mro__`.
35943595

35953596

35963597
.. method:: class.__subclasses__

0 commit comments

Comments
 (0)