merge heads

2 files changed, 11 insertions, 11 deletions

diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index 37637d6..69a2faf 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -4971,22 +4971,16 @@ class CWhitebox(unittest.TestCase):
     def test_c_format(self):
         # Restricted input
         Decimal = C.Decimal
-        InvalidOperation = C.InvalidOperation
-        Rounded = C.Rounded
-        localcontext = C.localcontext
         HAVE_CONFIG_64 = (C.MAX_PREC > 425000000)
 
         self.assertRaises(TypeError, Decimal(1).__format__, "=10.10", [], 9)
         self.assertRaises(TypeError, Decimal(1).__format__, "=10.10", 9)
         self.assertRaises(TypeError, Decimal(1).__format__, [])
 
-        with localcontext() as c:
-            c.traps[InvalidOperation] = True
-            c.traps[Rounded] = True
-            self.assertRaises(ValueError, Decimal(1).__format__, "<>=10.10")
-            maxsize = 2**63-1 if HAVE_CONFIG_64 else 2**31-1
-            self.assertRaises(InvalidOperation, Decimal("1.23456789").__format__,
-                              "=%d.1" % maxsize)
+        self.assertRaises(ValueError, Decimal(1).__format__, "<>=10.10")
+        maxsize = 2**63-1 if HAVE_CONFIG_64 else 2**31-1
+        self.assertRaises(ValueError, Decimal("1.23456789").__format__,
+                          "=%d.1" % maxsize)
 
     def test_c_integral(self):
         Decimal = C.Decimal
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index 5e9fd67..89386ff 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -3222,7 +3222,13 @@ dec_format(PyObject *dec, PyObject *args)
 
     decstring = mpd_qformat_spec(MPD(dec), &spec, CTX(context), &status);
     if (decstring == NULL) {
-        dec_addstatus(context, status);
+        if (status & MPD_Malloc_error) {
+            PyErr_NoMemory();
+        }
+        else {
+            PyErr_SetString(PyExc_ValueError,
+                "format specification exceeds internal limits of _decimal");
+        }
         goto finish;
     }
     result = PyUnicode_DecodeUTF8(decstring, strlen(decstring), NULL);