Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 07:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give a better error message when a string of the wrong size is

Browse source 
passed to RawBitMap.
This commit is contained in:
Jack Jansen 2003-03-21 16:42:36 +00:00
parent 47345a794f
commit bc4ded9bc0
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mac/Modules/qd/_Qdmodule.c
View file

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

4
Mac/Modules/qd/qdsupport.py
View file

@ -420,7 +420,9 @@ def outputCleanupStructMembers(self):
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);