Author: brett.cannon Date: Thu Mar 1 00:39:15 2007 New Revision: 54047 Modified: python/branches/p3yk_no_args_on_exc/BROKEN python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c Log: Fix _bsddb for the BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/BROKEN ============================================================================== --- python/branches/p3yk_no_args_on_exc/BROKEN (original) +++ python/branches/p3yk_no_args_on_exc/BROKEN Thu Mar 1 00:39:15 2007 @@ -2,7 +2,6 @@ thus constructor gets passed two arguments (thanks to PyErr_NormalizeException() passing any tuple given to it as a value as the args tuple, but not when it is any other type of value). - + test_bsddb + test_bsddb3 (?) * doctest oddness (need to change how SyntaxError is handled?) Modified: python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c (original) +++ python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c Thu Mar 1 00:39:15 2007 @@ -323,7 +323,7 @@ #define _CHECK_OBJECT_NOT_CLOSED(nonNull, pyErrObj, name) \ if ((nonNull) == NULL) { \ PyObject *errTuple = NULL; \ - errTuple = Py_BuildValue("(is)", 0, #name " object has been closed"); \ + errTuple = Py_BuildValue("((is))", 0, #name " object has been closed"); \ PyErr_SetObject((pyErrObj), errTuple); \ Py_DECREF(errTuple); \ return NULL; \ @@ -602,7 +602,7 @@ } _db_errmsg[0] = 0; - errTuple = Py_BuildValue("(is)", err, errTxt); + errTuple = Py_BuildValue("((is))", err, errTxt); PyErr_SetObject(errObj, errTuple); Py_DECREF(errTuple); } @@ -1931,7 +1931,7 @@ #endif if (NULL == self->db) { - PyObject *t = Py_BuildValue("(is)", 0, + PyObject *t = Py_BuildValue("((is))", 0, "Cannot call open() twice for DB object"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -2703,7 +2703,7 @@ DBObject* self = (DBObject*)_self; if (self->db == NULL) { - PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed"); + PyObject *t = Py_BuildValue("((is))", 0, "DB object has been closed"); PyErr_SetObject(DBError, t); Py_DECREF(t); return -1; @@ -2795,7 +2795,7 @@ int flags = 0; if (self->db == NULL) { - PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed"); + PyObject *t = Py_BuildValue("((is))", 0, "DB object has been closed"); PyErr_SetObject(DBError, t); Py_DECREF(t); return -1; @@ -4686,7 +4686,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4723,7 +4723,7 @@ } if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0,"DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0,"DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4745,7 +4745,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4770,7 +4770,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4799,7 +4799,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t);