Clear the context flags if a context is initialized from the DefaultContext.

Stefan Krah · Stefan Krah · commit 5100171d8150 · 2012-04-02T15:02:21.000+02:00
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
@@ -56,6 +56,76 @@
 fractions = {C:cfractions, P:pfractions}
 sys.modules['decimal'] = orig_sys_decimal
 
+############ RunFirst ############
+class RunFirst(unittest.TestCase):
+
+   def setUp(self):
+       self.save_default = self.decimal.DefaultContext.copy()
+
+   def tearDown(self):
+       DefaultContext = self.decimal.DefaultContext
+
+       DefaultContext.prec = self.save_default.prec
+       DefaultContext.rounding = self.save_default.rounding
+       DefaultContext.Emax = self.save_default.Emax
+       DefaultContext.Emin = self.save_default.Emin
+       DefaultContext.capitals = self.save_default.capitals
+       DefaultContext.clamp = self.save_default.clamp
+       DefaultContext.flags = self.save_default.flags
+       DefaultContext.traps = self.save_default.traps
+
+       self.decimal.setcontext(self.decimal.DefaultContext)
+
+   def test_00default_context(self):
+       # The test depends on the fact that getcontext() is called
+       # for the first time.
+       DefaultContext = self.decimal.DefaultContext
+       ROUND_05UP = self.decimal.ROUND_05UP
+       Clamped = self.decimal.Clamped
+       InvalidOperation = self.decimal.InvalidOperation
+
+       DefaultContext.prec = 5001
+       DefaultContext.rounding = ROUND_05UP
+       DefaultContext.Emax = 10025
+       DefaultContext.Emin = -10025
+       DefaultContext.capitals = 0
+       DefaultContext.clamp = 1
+       DefaultContext.flags[InvalidOperation] = True
+       DefaultContext.clear_traps()
+       DefaultContext.traps[Clamped] = True
+
+       # implicit initialization on first access
+       c = self.decimal.getcontext()
+
+       self.assertEqual(c.prec, 5001)
+       self.assertEqual(c.rounding, ROUND_05UP)
+       self.assertEqual(c.Emax, 10025)
+       self.assertEqual(c.Emin, -10025)
+       self.assertEqual(c.capitals, 0)
+       self.assertEqual(c.clamp, 1)
+       for k in c.flags:
+           self.assertFalse(c.flags[k])
+       for k in c.traps:
+           if k is Clamped:
+               self.assertTrue(c.traps[k])
+           else:
+               self.assertFalse(c.traps[k])
+
+       # explicit initialization
+       self.decimal.setcontext(DefaultContext)
+       c = self.decimal.getcontext()
+       for k in c.flags:
+           self.assertFalse(c.flags[k])
+
+class CRunFirst(RunFirst):
+    decimal = C
+class PyRunFirst(RunFirst):
+    decimal = P
+if C:
+    run_unittest(CRunFirst, PyRunFirst)
+else:
+    run_unittest(PyRunFirst)
+############ END RunFirst ############
 
 # Useful Test Constant
 Signals = {
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
@@ -1494,6 +1494,10 @@ current_context(void)
     }
 
     *CTX(module_context) = *CTX(default_context_template);
+    CTX(module_context)->status = 0;
+    CTX(module_context)->newtrap = 0;
+    CtxCaps(module_context) = CtxCaps(default_context_template);
+
     module_context_set = 1;
     return module_context;
 }
@@ -1533,6 +1537,7 @@ PyDec_SetCurrentContext(PyObject *self UNUSED, PyObject *v)
         if (v == NULL) {
             return NULL;
         }
+        CTX(v)->status = 0;
     }
     else {
         Py_INCREF(v);
@@ -1581,6 +1586,8 @@ current_context(void)
     if (tl_context == NULL) {
         return NULL;
     }
+    CTX(tl_context)->status = 0;
+
     if (PyDict_SetItem(dict, tls_context_key, tl_context) < 0) {
         Py_DECREF(tl_context);
         return NULL;
@@ -1646,6 +1653,7 @@ PyDec_SetCurrentContext(PyObject *self UNUSED, PyObject *v)
         if (v == NULL) {
             return NULL;
         }
+        CTX(v)->status = 0;
     }
     else {
         Py_INCREF(v);

Original file line number	Diff line number	Diff line change
`@@ -1494,6 +1494,10 @@ current_context(void)`
`1494`	`1494`	`}`
`1495`	`1495`
`1496`	`1496`	`CTX(module_context) = CTX(default_context_template);`
	`1497`	`+ CTX(module_context)->status = 0;`
	`1498`	`+ CTX(module_context)->newtrap = 0;`
	`1499`	`+ CtxCaps(module_context) = CtxCaps(default_context_template);`
	`1500`	`+`
`1497`	`1501`	`module_context_set = 1;`
`1498`	`1502`	`return module_context;`
`1499`	`1503`	`}`
`@@ -1533,6 +1537,7 @@ PyDec_SetCurrentContext(PyObject self UNUSED, PyObject v)`
`1533`	`1537`	`if (v == NULL) {`
`1534`	`1538`	`return NULL;`
`1535`	`1539`	`}`
	`1540`	`+ CTX(v)->status = 0;`
`1536`	`1541`	`}`
`1537`	`1542`	`else {`
`1538`	`1543`	`Py_INCREF(v);`
`@@ -1581,6 +1586,8 @@ current_context(void)`
`1581`	`1586`	`if (tl_context == NULL) {`
`1582`	`1587`	`return NULL;`
`1583`	`1588`	`}`
	`1589`	`+ CTX(tl_context)->status = 0;`
	`1590`	`+`
`1584`	`1591`	`if (PyDict_SetItem(dict, tls_context_key, tl_context) < 0) {`
`1585`	`1592`	`Py_DECREF(tl_context);`
`1586`	`1593`	`return NULL;`
`@@ -1646,6 +1653,7 @@ PyDec_SetCurrentContext(PyObject self UNUSED, PyObject v)`
`1646`	`1653`	`if (v == NULL) {`
`1647`	`1654`	`return NULL;`
`1648`	`1655`	`}`
	`1656`	`+ CTX(v)->status = 0;`
`1649`	`1657`	`}`
`1650`	`1658`	`else {`
`1651`	`1659`	`Py_INCREF(v);`