diff options
| author | Éric Araujo <aeric@mtlpy.org> | 2012-12-09 03:57:08 (GMT) |
|---|---|---|
| committer | Éric Araujo <aeric@mtlpy.org> | 2012-12-09 03:57:08 (GMT) |
| commit | bb7da03f6e558014d9863cc4501a2ac91c7c2a3a (patch) | |
| tree | cae020b28344421abc7c3535d425c63c0b6c7119 /Doc/library | |
| parent | 53f604c79458861553d0ea00db44074b7c4d4333 (diff) | |
| parent | 3f7c0e403606f7e888442048ac71cb8f391e8d83 (diff) | |
| download | cpython-bb7da03f6e558014d9863cc4501a2ac91c7c2a3a.zip cpython-bb7da03f6e558014d9863cc4501a2ac91c7c2a3a.tar.gz cpython-bb7da03f6e558014d9863cc4501a2ac91c7c2a3a.tar.bz2 | |
Merge fixes for #13614, #13512 and #7719 from 3.3
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/abc.rst | 6 | ||||
| -rw-r--r-- | Doc/library/io.rst | 2 | ||||
| -rw-r--r-- | Doc/library/sys.rst | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/abc.rst b/Doc/library/abc.rst index db3adbd..6f23596 100644 --- a/Doc/library/abc.rst +++ b/Doc/library/abc.rst @@ -129,7 +129,7 @@ This module provides the following class: The :mod:`abc` module also provides the following decorators: -.. decorator:: abstractmethod(function) +.. decorator:: abstractmethod A decorator indicating abstract methods. @@ -203,7 +203,7 @@ The :mod:`abc` module also provides the following decorators: multiple-inheritance. -.. decorator:: abstractclassmethod(function) +.. decorator:: abstractclassmethod A subclass of the built-in :func:`classmethod`, indicating an abstract classmethod. Otherwise it is similar to :func:`abstractmethod`. @@ -224,7 +224,7 @@ The :mod:`abc` module also provides the following decorators: :func:`abstractmethod`, making this decorator redundant. -.. decorator:: abstractstaticmethod(function) +.. decorator:: abstractstaticmethod A subclass of the built-in :func:`staticmethod`, indicating an abstract staticmethod. Otherwise it is similar to :func:`abstractmethod`. diff --git a/Doc/library/io.rst b/Doc/library/io.rst index 810e56f..98e0358 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -232,7 +232,7 @@ I/O Base Classes Note that calling any method (even inquiries) on a closed stream is undefined. Implementations may raise :exc:`ValueError` in this case. - :class:`IOBase` (and its subclasses) support the iterator protocol, meaning + :class:`IOBase` (and its subclasses) supports the iterator protocol, meaning that an :class:`IOBase` object can be iterated over yielding the lines in a stream. Lines are defined slightly differently depending on whether the stream is a binary stream (yielding bytes), or a text stream (yielding diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 5e2b371..c327f21 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -833,7 +833,7 @@ always available. For other systems, the values are: ================ =========================== - System :data:`platform` value + System ``platform`` value ================ =========================== Linux ``'linux'`` Windows ``'win32'`` |