summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorStefan Krah <stefan@bytereef.org>2010-05-19 15:52:31 (GMT)
committerStefan Krah <stefan@bytereef.org>2010-05-19 15:52:31 (GMT)
commit2eb4a07f9b23a91eed84546446baee9d315a7ec3 (patch)
tree2a6407250472b9db32fa5a4ceed3e76b5cd386b6 /Lib
parentba644a62b0637b4a816554c3f8ab9379dbcd84b1 (diff)
downloadcpython-2eb4a07f9b23a91eed84546446baee9d315a7ec3.zip
cpython-2eb4a07f9b23a91eed84546446baee9d315a7ec3.tar.gz
cpython-2eb4a07f9b23a91eed84546446baee9d315a7ec3.tar.bz2
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')
-rw-r--r--Lib/decimal.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py
index 6480880..c9edf9c 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
@@ -3888,7 +3888,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)