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

Revert rev. 59925, it breaks comtypes (I need to further examine this).

This commit is contained in:
Thomas Heller 2008-01-28 08:44:13 +00:00
parent d7e1b2bd17
commit 99120c4f7e
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/ctypes/test/test_funcptr.py
View File

@ -123,11 +123,5 @@ class CFuncPtrTestCase(unittest.TestCase):
self.failUnlessEqual(strtok(None, "\n"), "c") self.failUnlessEqual(strtok(None, "\n"), "c")
self.failUnlessEqual(strtok(None, "\n"), None) self.failUnlessEqual(strtok(None, "\n"), None)
def test_NULL_funcptr(self):
tp = CFUNCTYPE(c_int)
func = tp() # NULL function pointer
# raise a ValueError when we try to call it
self.assertRaises(ValueError, func)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

5
Modules/_ctypes/_ctypes.c
View File

@ -3435,11 +3435,6 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
pProc = *(void **)self->b_ptr; pProc = *(void **)self->b_ptr;
if (pProc == NULL) {
PyErr_SetString(PyExc_ValueError,
"attempt to call NULL function pointer");
return NULL;
}
#ifdef MS_WIN32 #ifdef MS_WIN32
if (self->index) { if (self->index) {
/* It's a COM method */ /* It's a COM method */