From fe17b2bc77851be1724f9ce2ea07112a06f413ab Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Sun, 25 Mar 2012 18:59:21 +0200 Subject: Raise MemoryError instead of InvalidOperation/MallocError for compatibility with decimal.py. The standard specifies InsufficientStorage (MallocError) as a sub-condition of InvalidOperation. This allows a calculation to continue with NaN results when allocation fails. --- Lib/test/test_decimal.py | 2 +- Modules/_decimal/_decimal.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 4a352e5..694b959 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -3837,7 +3837,7 @@ class CheckAttributes(unittest.TestCase): x = dir(C) y = [s for s in dir(P) if '__' in s or not s.startswith('_')] - self.assertEqual(set(x) - set(y), {'MallocError'}) + self.assertEqual(set(x) - set(y), set()) def test_context_attributes(self): diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index aa39de1..bb2df44 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -168,7 +168,9 @@ static DecCondMap cond_map[] = { {"DivisionImpossible", "decimal.DivisionImpossible", MPD_Division_impossible, NULL}, {"DivisionUndefined", "decimal.DivisionUndefined", MPD_Division_undefined, NULL}, {"InvalidContext", "decimal.InvalidContext", MPD_Invalid_context, NULL}, +#ifdef EXTRA_FUNCTIONALITY {"MallocError", "decimal.MallocError", MPD_Malloc_error, NULL}, +#endif {NULL} }; @@ -466,9 +468,14 @@ dec_addstatus(PyObject *context, uint32_t status) mpd_context_t *ctx = CTX(context); ctx->status |= status; - if (ctx->traps&status) { + if (status & (ctx->traps|MPD_Malloc_error)) { PyObject *ex, *siglist; + if (status & MPD_Malloc_error) { + PyErr_NoMemory(); + return 1; + } + ex = flags_as_exception(ctx->traps&status); if (ex == NULL) { return 1; /* GCOV_NOT_REACHED */ -- cgit v0.12