Skip to content

Commit 12962b5

Browse files
committed
bpo-28886: Fix Typo and some better organising of the description.
1 parent 3b8d317 commit 12962b5

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

Doc/library/abc.rst

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,15 @@ The :mod:`abc` module also provides the following decorators:
221221
multiple-inheritance.
222222

223223

224-
The :mod:`abc` module also support following legacy builtin decorators:
224+
The :mod:`abc` module also supports the following legacy builtin decorators:
225225

226226
.. decorator:: abstractclassmethod
227227

228+
.. versionadded:: 3.2
229+
.. deprecated:: 3.3
230+
It is now possible to use :class:`classmethod` with
231+
:func:`abstractmethod`, making this decorator redundant.
232+
228233
A subclass of the built-in :func:`classmethod`, indicating an abstract
229234
classmethod. Otherwise it is similar to :func:`abstractmethod`.
230235

@@ -238,14 +243,14 @@ The :mod:`abc` module also support following legacy builtin decorators:
238243
def my_abstract_classmethod(cls, ...):
239244
...
240245

246+
247+
.. decorator:: abstractstaticmethod
248+
241249
.. versionadded:: 3.2
242250
.. deprecated:: 3.3
243-
It is now possible to use :class:`classmethod` with
251+
It is now possible to use :class:`staticmethod` with
244252
:func:`abstractmethod`, making this decorator redundant.
245253

246-
247-
.. decorator:: abstractstaticmethod
248-
249254
A subclass of the built-in :func:`staticmethod`, indicating an abstract
250255
staticmethod. Otherwise it is similar to :func:`abstractmethod`.
251256

@@ -259,14 +264,14 @@ The :mod:`abc` module also support following legacy builtin decorators:
259264
def my_abstract_staticmethod(...):
260265
...
261266

262-
.. versionadded:: 3.2
263-
.. deprecated:: 3.3
264-
It is now possible to use :class:`staticmethod` with
265-
:func:`abstractmethod`, making this decorator redundant.
266-
267267

268268
.. decorator:: abstractproperty(fget=None, fset=None, fdel=None, doc=None)
269269

270+
.. deprecated:: 3.3
271+
It is now possible to use :class:`property`, :meth:`property.getter`,
272+
:meth:`property.setter` and :meth:`property.deleter` with
273+
:func:`abstractmethod`, making this decorator redundant.
274+
270275
A subclass of the built-in :func:`property`, indicating an abstract
271276
property.
272277

@@ -309,12 +314,6 @@ The :mod:`abc` module also support following legacy builtin decorators:
309314
...
310315

311316

312-
.. deprecated:: 3.3
313-
It is now possible to use :class:`property`, :meth:`property.getter`,
314-
:meth:`property.setter` and :meth:`property.deleter` with
315-
:func:`abstractmethod`, making this decorator redundant.
316-
317-
318317
The :mod:`abc` module also provides the following functions:
319318

320319
.. function:: get_cache_token()

0 commit comments

Comments
 (0)