Author: brett.cannon Date: Thu Mar 1 00:51:06 2007 New Revision: 54048 Modified: python/branches/p3yk_no_args_on_exc/BROKEN python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Log: Clean up the output from IOError. Allows test_xml_etree to pass after 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:51:06 2007 @@ -3,6 +3,3 @@ 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_bsddb3 (?) - -* doctest oddness (need to change how SyntaxError is handled?) - + test_xml_etree Modified: python/branches/p3yk_no_args_on_exc/Objects/exceptions.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Objects/exceptions.c (original) +++ python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Thu Mar 1 00:51:06 2007 @@ -524,7 +524,7 @@ { PyObject *rtnval = NULL; - if (self->filename) { + if (self->filename != Py_None) { PyObject *fmt; PyObject *repr; PyObject *tuple; @@ -558,7 +558,7 @@ Py_DECREF(fmt); Py_DECREF(tuple); } - else if (self->myerrno && self->strerror) { + else if (self->myerrno != Py_None && self->strerror != Py_None) { PyObject *fmt; PyObject *tuple;