Merged revisions 61892,61900 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61892 | mark.dickinson | 2008-03-25 15:33:23 +0100 (Tue, 25 Mar 2008) | 3 lines

  Issue #2478: Decimal(sqrt(0)) failed when the decimal context
  was not explicitly supplied.
........
  r61900 | georg.brandl | 2008-03-25 18:36:43 +0100 (Tue, 25 Mar 2008) | 2 lines

  Add Benjamin.
........
This commit is contained in:
Christian Heimes 2008-03-26 12:55:56 +00:00
parent 44471f3c55
commit 0348fb6d19
3 changed files with 12 additions and 3 deletions

View file

@ -2454,6 +2454,9 @@ class Decimal(_numbers.Real):
def sqrt(self, context=None):
"""Return the square root of self."""
if context is None:
context = getcontext()
if self._is_special:
ans = self._check_nans(context=context)
if ans:
@ -2467,9 +2470,6 @@ class Decimal(_numbers.Real):
ans = _dec_from_triple(self._sign, '0', self._exp // 2)
return ans._fix(context)
if context is None:
context = getcontext()
if self._sign == 1:
return context._raise_error(InvalidOperation, 'sqrt(-x), x > 0')