From bc4ded9bc05f4c6924b5a7efc4dd9705999b99fa Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Fri, 21 Mar 2003 16:42:36 +0000 Subject: [PATCH] Give a better error message when a string of the wrong size is passed to RawBitMap. --- Mac/Modules/qd/_Qdmodule.c | 10 ++++++---- Mac/Modules/qd/qdsupport.py | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c index 8187baa4b0..f2994dbca2 100644 --- a/Mac/Modules/qd/_Qdmodule.c +++ b/Mac/Modules/qd/_Qdmodule.c @@ -14,9 +14,9 @@ /* Macro to test whether a weak-loaded CFM function exists */ #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ - PyErr_SetString(PyExc_NotImplementedError, \ - "Not available in this shared library/OS version"); \ - return NULL; \ + PyErr_SetString(PyExc_NotImplementedError, \ + "Not available in this shared library/OS version"); \ + return NULL; \ }} while(0) @@ -6258,7 +6258,9 @@ static PyObject *Qd_RawBitMap(PyObject *_self, PyObject *_args) if ( !PyArg_ParseTuple(_args, "O!", &PyString_Type, &source) ) return NULL; if ( PyString_Size(source) != sizeof(BitMap) && PyString_Size(source) != sizeof(PixMap) ) { - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "Argument size was %d, should be %d (sizeof BitMap) or %d (sizeof PixMap)", + PyString_Size(source), sizeof(BitMap), sizeof(PixMap)); return NULL; } ptr = (BitMapPtr)PyString_AsString(source); diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py index 1e96980c17..18e628f598 100644 --- a/Mac/Modules/qd/qdsupport.py +++ b/Mac/Modules/qd/qdsupport.py @@ -420,7 +420,9 @@ PyObject *source; if ( !PyArg_ParseTuple(_args, "O!", &PyString_Type, &source) ) return NULL; if ( PyString_Size(source) != sizeof(BitMap) && PyString_Size(source) != sizeof(PixMap) ) { - PyErr_BadArgument(); + PyErr_Format(PyExc_TypeError, + "Argument size was %d, should be %d (sizeof BitMap) or %d (sizeof PixMap)", + PyString_Size(source), sizeof(BitMap), sizeof(PixMap)); return NULL; } ptr = (BitMapPtr)PyString_AsString(source); -- 2.50.1