ident.pyx, defs.pxi: Use Pyrex `typecheck' for type checking.

Throw away the previous kludgy hacking with `PyObject_TypeCheck'.

diff --git a/defs.pxi b/defs.pxi
index bfb4dcc52827fff16ce855a513a1694d607c3918..cec2d8654e20278c4468d881c4588c9a064a6a17 100644 (file)
--- a/defs.pxi
+++ b/defs.pxi
@@ -98,7 +98,6 @@ cdef extern from 'Python.h':
   object PyString_FromStringAndSize(char *p, Py_ssize_t len)
   int PyString_AsStringAndSize(obj, char **p, Py_ssize_t *len) except -1
   int PyObject_AsReadBuffer(obj, void **buf, Py_ssize_t *len) except -1
   object PyString_FromStringAndSize(char *p, Py_ssize_t len)
   int PyString_AsStringAndSize(obj, char **p, Py_ssize_t *len) except -1
   int PyObject_AsReadBuffer(obj, void **buf, Py_ssize_t *len) except -1

-  int PyObject_TypeCheck(obj, ty)

   object PyInt_FromLong(long i)
   object PyLong_FromUnsignedLong(unsigned long i)
   char *PyString_AS_STRING(string)
   object PyInt_FromLong(long i)
   object PyLong_FromUnsignedLong(unsigned long i)
   char *PyString_AS_STRING(string)

diff --git a/ident.pyx b/ident.pyx
index 90d8f0f64b13849a976dee96b2076dafdda1179b..7ea6b454d10c749da8c24059cae6bed0f0b5783c 100644 (file)
--- a/ident.pyx
+++ b/ident.pyx
@@ -57,7 +57,7 @@ cdef class SelIdentify:
     cdef sockaddr_in s_in, s_out
     cdef socklen_t sz_in, sz_out
     cdef int fd
     cdef sockaddr_in s_in, s_out
     cdef socklen_t sz_in, sz_out
     cdef int fd

-    if PyObject_TypeCheck(sk, socket.SocketType):
+    if typecheck(sk, socket.SocketType):

       fd = sk.fileno()
       sz_in = PSIZEOF(&s_in)
       sz_out = PSIZEOF(&s_out)
       fd = sk.fileno()
       sz_in = PSIZEOF(&s_in)
       sz_out = PSIZEOF(&s_out)