traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

This commit is contained in:
Michael Foord 2012-03-25 18:16:26 +01:00
parent 313f85f0ca fe17b2bc77
commit a3eabb6f8e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_decimal.py
View File

@ -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):

9
Modules/_decimal/_decimal.c
View File

@ -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 */