diff options
author | Stefan Krah <stefan@bytereef.org> | 2010-05-19 15:54:54 (GMT) |
---|---|---|
committer | Stefan Krah <stefan@bytereef.org> | 2010-05-19 15:54:54 (GMT) |
commit | 395653e059a031baf80cabd3d2ebaec82b6dd112 (patch) | |
tree | 6ec244835db1eff6fd078471a14d79f67fad3c51 /Lib/decimal.py | |
parent | a0f6dcead087049bee3510938b2482107e0ae2d3 (diff) | |
download | cpython-395653e059a031baf80cabd3d2ebaec82b6dd112.zip cpython-395653e059a031baf80cabd3d2ebaec82b6dd112.tar.gz cpython-395653e059a031baf80cabd3d2ebaec82b6dd112.tar.bz2 |
Merged revisions 81352 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81352 | stefan.krah | 2010-05-19 17:52:31 +0200 (Wed, 19 May 2010) | 9 lines
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.
........
................
Diffstat (limited to 'Lib/decimal.py')
-rw-r--r-- | Lib/decimal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 9733e70..ecf0cd5 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -164,7 +164,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 @@ -3858,7 +3858,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) |