From e2544bc90941835bbac89db2a50bbceab0dea48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Thu, 3 Nov 2011 04:34:09 +0100 Subject: [PATCH 1/2] Fix incorrect docstring I changed a while back. New wording is taken straight from the PEP, so this time should be good :) --- Lib/numbers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/numbers.py b/Lib/numbers.py index f35704dd394..ecfad7cef8b 100644 --- a/Lib/numbers.py +++ b/Lib/numbers.py @@ -303,7 +303,7 @@ class Integral(Rational): raise NotImplementedError def __index__(self): - """someobject[self]""" + """Called whenever an index is needed, such as in slicing""" return int(self) @abstractmethod From a083823a85b102643a68bc50ca6c78c60e244cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Thu, 3 Nov 2011 04:35:20 +0100 Subject: [PATCH 2/2] Avoid relying on the default reST role in logging library doc --- Doc/library/logging.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 20cd57c5ae2..5d385c59689 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -137,7 +137,7 @@ instantiated directly, but always through the module-level function Stack (most recent call last): - This mimics the `Traceback (most recent call last):` which is used when + This mimics the ``Traceback (most recent call last):`` which is used when displaying exception frames. The third keyword argument is *extra* which can be used to pass a @@ -820,7 +820,7 @@ functions. Stack (most recent call last): - This mimics the `Traceback (most recent call last):` which is used when + This mimics the ``Traceback (most recent call last):`` which is used when displaying exception frames. The third optional keyword argument is *extra* which can be used to pass a @@ -1059,11 +1059,11 @@ with the :mod:`warnings` module. If *capture* is ``True``, warnings issued by the :mod:`warnings` module will be redirected to the logging system. Specifically, a warning will be formatted using :func:`warnings.formatwarning` and the resulting string - logged to a logger named 'py.warnings' with a severity of `WARNING`. + logged to a logger named ``'py.warnings'`` with a severity of ``'WARNING'``. If *capture* is ``False``, the redirection of warnings to the logging system will stop, and warnings will be redirected to their original destinations - (i.e. those in effect before `captureWarnings(True)` was called). + (i.e. those in effect before ``captureWarnings(True)`` was called). .. seealso::