Commit 85b9c82d authored by Jason Madden's avatar Jason Madden

fix build of ares.pyx since we removed our deprecated python.pxd

parent 67ed0c3a
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
# cython: auto_pickle=False # cython: auto_pickle=False
cimport cares cimport cares
import sys import sys
from python cimport *
from cpython.ref cimport Py_INCREF
from cpython.ref cimport Py_DECREF
from _socket import gaierror from _socket import gaierror
...@@ -207,7 +210,7 @@ cdef void gevent_ares_host_callback(void *arg, int status, int timeouts, hostent ...@@ -207,7 +210,7 @@ cdef void gevent_ares_host_callback(void *arg, int status, int timeouts, hostent
cdef channel channel cdef channel channel
cdef object callback cdef object callback
channel, callback = <tuple>arg channel, callback = <tuple>arg
Py_DECREF(<PyObjectPtr>arg) Py_DECREF(<tuple>arg)
cdef object host_result cdef object host_result
try: try:
if status or not host: if status or not host:
...@@ -227,7 +230,7 @@ cdef void gevent_ares_nameinfo_callback(void *arg, int status, int timeouts, cha ...@@ -227,7 +230,7 @@ cdef void gevent_ares_nameinfo_callback(void *arg, int status, int timeouts, cha
cdef channel channel cdef channel channel
cdef object callback cdef object callback
channel, callback = <tuple>arg channel, callback = <tuple>arg
Py_DECREF(<PyObjectPtr>arg) Py_DECREF(<tuple>arg)
cdef object node cdef object node
cdef object service cdef object service
try: try:
...@@ -408,7 +411,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh ...@@ -408,7 +411,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh
raise gaierror(cares.ARES_EDESTRUCTION, 'this ares channel has been destroyed') raise gaierror(cares.ARES_EDESTRUCTION, 'this ares channel has been destroyed')
# note that for file lookups still AF_INET can be returned for AF_INET6 request # note that for file lookups still AF_INET can be returned for AF_INET6 request
cdef object arg = (self, callback) cdef object arg = (self, callback)
Py_INCREF(<PyObjectPtr>arg) Py_INCREF(arg)
cares.ares_gethostbyname(self.channel, name, family, <void*>gevent_ares_host_callback, <void*>arg) cares.ares_gethostbyname(self.channel, name, family, <void*>gevent_ares_host_callback, <void*>arg)
def gethostbyaddr(self, object callback, char* addr): def gethostbyaddr(self, object callback, char* addr):
...@@ -427,7 +430,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh ...@@ -427,7 +430,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh
else: else:
raise InvalidIP(repr(addr)) raise InvalidIP(repr(addr))
cdef object arg = (self, callback) cdef object arg = (self, callback)
Py_INCREF(<PyObjectPtr>arg) Py_INCREF(arg)
cares.ares_gethostbyaddr(self.channel, addr_packed, length, family, <void*>gevent_ares_host_callback, <void*>arg) cares.ares_gethostbyaddr(self.channel, addr_packed, length, family, <void*>gevent_ares_host_callback, <void*>arg)
cpdef _getnameinfo(self, object callback, tuple sockaddr, int flags): cpdef _getnameinfo(self, object callback, tuple sockaddr, int flags):
...@@ -447,7 +450,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh ...@@ -447,7 +450,7 @@ cdef public class channel [object PyGeventAresChannelObject, type PyGeventAresCh
if length <= 0: if length <= 0:
raise InvalidIP(repr(hostp)) raise InvalidIP(repr(hostp))
cdef object arg = (self, callback) cdef object arg = (self, callback)
Py_INCREF(<PyObjectPtr>arg) Py_INCREF(arg)
cdef sockaddr_t* x = <sockaddr_t*>&sa6 cdef sockaddr_t* x = <sockaddr_t*>&sa6
cares.ares_getnameinfo(self.channel, x, length, flags, <void*>gevent_ares_nameinfo_callback, <void*>arg) cares.ares_getnameinfo(self.channel, x, length, flags, <void*>gevent_ares_nameinfo_callback, <void*>arg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment