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.
........

diff --git a/Lib/decimal.py b/Lib/decimal.py
index 75a1d5ec3f06ad679d97e15d846c1f33d079c167..a2e7fa409272d5ba322257587f4dafa1174a5758 100644 (file)
--- a/Lib/decimal.py
+++ b/Lib/decimal.py
@@ -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')
 

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 7c607f94ca0a4e8dc2372f5a8b09acf5c27c69fb..a76b505bfec73ef55508de7594448b0433b9ddd9 100644 (file)
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1303,6 +1303,12 @@ class DecimalUsabilityTest(unittest.TestCase):
         d = d1.max(d2)
         self.assertTrue(type(d) is Decimal)
 
+    def test_implicit_context(self):
+        # Check results when context given implicitly.  (Issue 2478)
+        c = getcontext()
+        self.assertEqual(str(Decimal(0).sqrt()),
+                         str(c.sqrt(Decimal(0))))
+
 
 class DecimalPythonAPItests(unittest.TestCase):
 

diff --git a/Misc/developers.txt b/Misc/developers.txt
index 089e122b3d76badafe6a405e2577827d0562ea69..afb031f06f07422f9cdeb70de92cb44c65cc983e 100644 (file)
--- a/Misc/developers.txt
+++ b/Misc/developers.txt
@@ -17,6 +17,9 @@ the format to accommodate documentation needs as they arise.
 Permissions History
 -------------------
 
+- Benjamin Peterson was given SVN access on 25 March 2008 by Georg
+  Brandl, for bug triage work.
+
 - Jerry Seutter was given SVN access on 20 March 2008 by BAC, for
   general contributions to Python.