Merged revisions 81352 via svnmerge from

cloud-tester · cloud-tester · commit 395653e059a0 · 2010-05-19T15:54:54.000Z
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.
  ........
................
diff --git 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 @@ def _raise_error(self, condition, explanation = None, *args):
 
         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)
