From: Stefan Krah Date: Wed, 19 May 2010 15:50:05 +0000 (+0000) Subject: Merged revisions 81350 via svnmerge from X-Git-Tag: v2.6.6rc1~277 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9490851e1811983320de30709aa4060ce42dd7fe;p=python Merged revisions 81350 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81350 | stefan.krah | 2010-05-19 17:46:39 +0200 (Wed, 19 May 2010) | 1 line Fix typos in docstrings. ........ --- diff --git a/Lib/decimal.py b/Lib/decimal.py index 523d2523a3..b961840545 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -165,7 +165,7 @@ class DecimalException(ArithmeticError): anything, though. handle -- Called when context._raise_error is called and the - trap_enabler is set. First argument is self, second is the + trap_enabler is not set. First argument is self, second is the context. More arguments can be given, those being after the explanation in _raise_error (For example, context._raise_error(NewError, '(-x)!', self._sign) would @@ -3741,7 +3741,7 @@ class Context(object): If the flag is in _ignored_flags, returns the default response. Otherwise, it sets the flag, then, if the corresponding - trap_enabler is set, it reaises the exception. Otherwise, it returns + trap_enabler is set, it reraises the exception. Otherwise, it returns the default value after setting the flag. """ error = _condition_map.get(condition, condition)