Commit 6bc1f938 authored by Denis Bilenko's avatar Denis Bilenko

rename handle_error's argument "where" to "context"

parent 35777505
static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* where) { static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* context) {
PyThreadState *tstate; PyThreadState *tstate;
PyObject *type, *value, *traceback, *result; PyObject *type, *value, *traceback, *result;
tstate = PyThreadState_GET(); tstate = PyThreadState_GET();
...@@ -16,7 +16,7 @@ static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* where ...@@ -16,7 +16,7 @@ static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* where
PyErr_Clear(); PyErr_Clear();
result = ((struct __pyx_vtabstruct_6gevent_4core_loop *)loop->__pyx_vtab)->handle_error(loop, where, type, value, traceback, 0); result = ((struct __pyx_vtabstruct_6gevent_4core_loop *)loop->__pyx_vtab)->handle_error(loop, context, type, value, traceback, 0);
if (result) { if (result) {
Py_DECREF(result); Py_DECREF(result);
......
...@@ -18,7 +18,7 @@ DEFINE_CALLBACKS ...@@ -18,7 +18,7 @@ DEFINE_CALLBACKS
static void gevent_signal_check(struct ev_loop *, void *, int); static void gevent_signal_check(struct ev_loop *, void *, int);
struct PyGeventLoopObject; struct PyGeventLoopObject;
static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* where); static void gevent_handle_error(struct PyGeventLoopObject* loop, PyObject* context);
#if defined(_WIN32) #if defined(_WIN32)
static void gevent_periodic_signal_check(struct ev_loop *, void *, int); static void gevent_periodic_signal_check(struct ev_loop *, void *, int);
......
...@@ -273,17 +273,17 @@ cdef public class loop [object PyGeventLoopObject, type PyGeventLoop_Type]: ...@@ -273,17 +273,17 @@ cdef public class loop [object PyGeventLoopObject, type PyGeventLoop_Type]:
def __get__(self): def __get__(self):
return libev.EV_MINPRI return libev.EV_MINPRI
cpdef handle_error(self, where, type, value, tb): cpdef handle_error(self, context, type, value, tb):
cdef object handle_error cdef object handle_error
cdef object error_handler = self.error_handler cdef object error_handler = self.error_handler
if error_handler is not None: if error_handler is not None:
# we do want to do getattr every time so that setting Hub.handle_error property just works # we do want to do getattr every time so that setting Hub.handle_error property just works
handle_error = getattr(error_handler, 'handle_error', error_handler) handle_error = getattr(error_handler, 'handle_error', error_handler)
handle_error(where, type, value, tb) handle_error(context, type, value, tb)
else: else:
self._default_handle_error(where, type, value, tb) self._default_handle_error(context, type, value, tb)
cpdef _default_handle_error(self, where, type, value, tb): cpdef _default_handle_error(self, context, type, value, tb):
# note: Hub sets its own error handler so this is not used by gevent # note: Hub sets its own error handler so this is not used by gevent
# this is here to make core.loop usable without the rest of gevent # this is here to make core.loop usable without the rest of gevent
import traceback import traceback
......
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