diff options
| author | Thomas Heller <theller@ctypes.org> | 2008-01-28 08:44:13 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2008-01-28 08:44:13 (GMT) |
| commit | 99120c4f7ea621ba2386c11d1300da335853dd68 (patch) | |
| tree | ecc8d49017ac2fa6056b6a09668c7c86acb9e05a | |
| parent | d7e1b2bd17cee31bb581a71fff20101be0b34bc6 (diff) | |
| download | cpython-99120c4f7ea621ba2386c11d1300da335853dd68.zip cpython-99120c4f7ea621ba2386c11d1300da335853dd68.tar.gz cpython-99120c4f7ea621ba2386c11d1300da335853dd68.tar.bz2 | |
Revert rev. 59925, it breaks comtypes (I need to further examine this).
| -rw-r--r-- | Lib/ctypes/test/test_funcptr.py | 6 | ||||
| -rw-r--r-- | Modules/_ctypes/_ctypes.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py index 92bf89b..7ea873f 100644 --- a/Lib/ctypes/test/test_funcptr.py +++ b/Lib/ctypes/test/test_funcptr.py @@ -123,11 +123,5 @@ class CFuncPtrTestCase(unittest.TestCase): self.failUnlessEqual(strtok(None, "\n"), "c") 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__': unittest.main() diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 0f88f96..5d3cba5 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3435,11 +3435,6 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds) pProc = *(void **)self->b_ptr; - if (pProc == NULL) { - PyErr_SetString(PyExc_ValueError, - "attempt to call NULL function pointer"); - return NULL; - } #ifdef MS_WIN32 if (self->index) { /* It's a COM method */ |