Feb 24, 2022 · Feb 22, 2022 · Feb 24, 2022 · Feb 24, 2022 · Feb 23, 2022 · Feb 23, 2022
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
        else:
            self._name = str(name)

        self._cancel_requested =False
        self._num_cancels_requested =0
        self._must_cancel = False
        self._fut_waiter = None
        self._coro = coro
        task will be marked as cancelled when the wrapped coroutine
        terminates with a CancelledError exception (even if cancel()
        was not called).

        This also increases the task's count of cancellation requests.
        """
        self._log_traceback = False
        if self.done():
            return False
        if self._cancel_requested:
        self._num_cancels_requested += 1
        if self._num_cancels_requested > 1:
            return False
        self._cancel_requested = True
        if self._fut_waiter is not None:
            if self._fut_waiter.cancel(msg=msg):
                # Leave self._fut_waiter; it may be a Task that
        return True

    def cancelling(self):
        return self._cancel_requested
        """Return the count of the task's cancellation requests.

        This count is incremented when .cancel() is called
        and may be decremented using .uncancel().
        """
        return self._num_cancels_requested

    def uncancel(self):
        if self._cancel_requested:
            self._cancel_requested = False
            return True
        else:
            return False
        """Decrement the task's count of cancellation requests.

        This should be used by tasks that catch CancelledError
        and wish to continue indefinitely until they are cancelled again.

        Returns the remaining number of cancellation requests.
        """
        if self._num_cancels_requested > 0:
            self._num_cancels_requested -= 1
        return self._num_cancels_requested

    def __step(self, exc=None):
        if self.done():
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
    PyObject *task_context;
    int task_must_cancel;
    int task_log_destroy_pending;
    inttask_cancel_requested;
    inttask_num_cancels_requested;
 } TaskObj;

 typedef struct {
    Py_CLEAR(self->task_fut_waiter);
    self->task_must_cancel = 0;
    self->task_log_destroy_pending = 1;
    self->task_cancel_requested = 0;
    self->task_num_cancels_requested = 0;
    Py_INCREF(coro);
    Py_XSETREF(self->task_coro, coro);

 task will be marked as cancelled when the wrapped coroutine
 terminates with a CancelledError exception (even if cancel()
 was not called).

 This also increases the task's count of cancellation requests.
 [clinic start generated code]*/

 static PyObject *
 _asyncio_Task_cancel_impl(TaskObj *self, PyObject *msg)
 /*[clinic end generated code: output=c66b60d41c74f9f1 input=f4ff8e8ffc5f1c00]*/
 /*[clinic end generated code: output=c66b60d41c74f9f1 input=7bb51bf25974c783]*/
 {
    self->task_log_tb = 0;

    if (self->task_state != STATE_PENDING) {
        Py_RETURN_FALSE;
    }

    if (self->task_cancel_requested) {
    self->task_num_cancels_requested += 1;
    if (self->task_num_cancels_requested > 1) {
        Py_RETURN_FALSE;
    }
    self->task_cancel_requested = 1;

    if (self->task_fut_waiter) {
        PyObject *res;
 /*[clinic input]
 _asyncio.Task.cancelling

 Return True if the task is in the process of being cancelled.

 This is set once .cancel() is called
 and remains set until .uncancel() is called.
 Return the count of the task's cancellation requests.

 As long as this flagisset, further .cancel()calls will be ignored,
 until .uncancel() is called to reset it.
 This countisincremented when .cancel()is called
 and may be decremented using .uncancel().
 [clinic start generated code]*/

 static PyObject *
 _asyncio_Task_cancelling_impl(TaskObj *self)
 /*[clinic end generated code: output=803b3af96f917d7e input=c50e50f9c3ca4676]*/
 /*[clinic end generated code: output=803b3af96f917d7e input=b625224d310cbb17]*/
 /*[clinic end generated code]*/
 {
    if (self->task_cancel_requested) {
        Py_RETURN_TRUE;
    }
    else {
        Py_RETURN_FALSE;
    }
    return PyLong_FromLong(self->task_num_cancels_requested);
 }

 /*[clinic input]
 _asyncio.Task.uncancel

 Reset theflag returned by cancelling().
 Decrement thetask's count of cancellation requests.

 This should be used by tasks that catch CancelledError
 and wish to continue indefinitely until they are cancelled again.

 Returns theprevious value ofthe flag.
 Returns theremaining number ofcancellation requests.
 [clinic start generated code]*/

 static PyObject *
 _asyncio_Task_uncancel_impl(TaskObj *self)
 /*[clinic end generated code: output=58184d236a817d3c input=5db95e28fcb6f7cd]*/
 /*[clinic end generated code: output=58184d236a817d3c input=68f81a4b90b46be2]*/
 /*[clinic end generated code]*/
 {
    if (self->task_cancel_requested) {
        self->task_cancel_requested = 0;
        Py_RETURN_TRUE;
    }
    else {
        Py_RETURN_FALSE;
    if (self->task_num_cancels_requested > 0) {
        self->task_num_cancels_requested -= 1;
    }
    return PyLong_FromLong(self->task_num_cancels_requested);
 }

 /*[clinic input]
diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,7 +105,7 @@ def __init__(self, coro, *, loop=None, name=None):
		else:
		self._name = str(name)

		self._cancel_requested =False
		self._num_cancels_requested =0
		self._must_cancel = False
		self._fut_waiter = None
		self._coro = coro
Expand DownExpand Up		@@ -198,13 +198,15 @@ def cancel(self, msg=None):
		task will be marked as cancelled when the wrapped coroutine
		terminates with a CancelledError exception (even if cancel()
		was not called).

		This also increases the task's count of cancellation requests.
		"""
		self._log_traceback = False
		if self.done():
		return False
		if self._cancel_requested:
		self._num_cancels_requested += 1
		if self._num_cancels_requested > 1:
		return False
		self._cancel_requested = True
		if self._fut_waiter is not None:
		if self._fut_waiter.cancel(msg=msg):
		# Leave self._fut_waiter; it may be a Task that
Expand All		@@ -217,14 +219,24 @@ def cancel(self, msg=None):
		return True

		def cancelling(self):
Copy link Contributor asvetlovFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is the`cancelling()` the best name for returning the number or cancel requests? It was good for bool flag, a counter needs better name IMHO. ambv reacted with thumbs up emoji Copy link Member gvanrossumFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Hm, do you have a suggestion? I was thinking that it's still usable as a "truthy" value. Usually when you're interested in the cancel count you should call`uncancel()` and use its return value. Copy link Contributor asvetlovFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I have no good answer. `cancel_requests_count()` describes exact meaning but the name is too long. `cancelling()` can return bool but it looks like procrastination: why return less info than we really have. The third option is dropping`cancelling()` method entirely, it is not required by the current asyncio code. We can consider adding the method later on-demand. Copy link Contributor asvetlovFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Note:`.cancelling()` doesn't exist in Python 3.10 Copy link Member gvanrossumFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. It's used in TaskGroup currently, so if we were to delete it we'd have to rewrite the code there in this same PR. It's also used by`Task.__repr__()` (via`_task_repr_info()`). But of those will work even though we upgraded it from a bool to an int. I'd say let's keep it for now, if we regret it we can rename or remove it before beta 1. Copy link Contributor asvetlovFeb 23, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Deal!
		return self._cancel_requested
		"""Return the count of the task's cancellation requests.

		This count is incremented when .cancel() is called
		and may be decremented using .uncancel().
		"""
		return self._num_cancels_requested

		def uncancel(self):
		if self._cancel_requested:
		self._cancel_requested = False
		return True
		else:
		return False
		"""Decrement the task's count of cancellation requests.

		This should be used by tasks that catch CancelledError
		and wish to continue indefinitely until they are cancelled again.

		Returns the remaining number of cancellation requests.
		"""
		if self._num_cancels_requested > 0:
		self._num_cancels_requested -= 1
		return self._num_cancels_requested

		def __step(self, exc=None):
		if self.done():
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,7 +91,7 @@ typedef struct {
		PyObject *task_context;
		int task_must_cancel;
		int task_log_destroy_pending;
		inttask_cancel_requested;
		inttask_num_cancels_requested;
		} TaskObj;

		typedef struct {
Expand DownExpand Up		@@ -2036,7 +2036,7 @@ _asyncio_Task___init___impl(TaskObj self, PyObject coro, PyObject *loop,
		Py_CLEAR(self->task_fut_waiter);
		self->task_must_cancel = 0;
		self->task_log_destroy_pending = 1;
		self->task_cancel_requested = 0;
		self->task_num_cancels_requested = 0;
		Py_INCREF(coro);
		Py_XSETREF(self->task_coro, coro);

Expand DownExpand Up		@@ -2191,22 +2191,24 @@ not return True (unless the task was already cancelled). A
		task will be marked as cancelled when the wrapped coroutine
		terminates with a CancelledError exception (even if cancel()
		was not called).

		This also increases the task's count of cancellation requests.
		[clinic start generated code]*/

		static PyObject *
		_asyncio_Task_cancel_impl(TaskObj self, PyObject msg)
		/[clinic end generated code: output=c66b60d41c74f9f1 input=f4ff8e8ffc5f1c00]/
		/[clinic end generated code: output=c66b60d41c74f9f1 input=7bb51bf25974c783]/
		{
		self->task_log_tb = 0;

		if (self->task_state != STATE_PENDING) {
		Py_RETURN_FALSE;
		}

		if (self->task_cancel_requested) {
		self->task_num_cancels_requested += 1;
		if (self->task_num_cancels_requested > 1) {
		Py_RETURN_FALSE;
		}
		self->task_cancel_requested = 1;

		if (self->task_fut_waiter) {
		PyObject *res;
Expand DownExpand Up		@@ -2238,51 +2240,40 @@ _asyncio_Task_cancel_impl(TaskObj self, PyObject msg)
		/*[clinic input]
		_asyncio.Task.cancelling

		Return True if the task is in the process of being cancelled.

		This is set once .cancel() is called
		and remains set until .uncancel() is called.
		Return the count of the task's cancellation requests.

		As long as this flagisset, further .cancel()calls will be ignored,
		until .uncancel() is called to reset it.
		This countisincremented when .cancel()is called
		and may be decremented using .uncancel().
		[clinic start generated code]*/

		static PyObject *
		_asyncio_Task_cancelling_impl(TaskObj *self)
		/[clinic end generated code: output=803b3af96f917d7e input=c50e50f9c3ca4676]/
		/[clinic end generated code: output=803b3af96f917d7e input=b625224d310cbb17]/
		/[clinic end generated code]/
		{
		if (self->task_cancel_requested) {
		Py_RETURN_TRUE;
		}
		else {
		Py_RETURN_FALSE;
		}
		return PyLong_FromLong(self->task_num_cancels_requested);
		}

		/*[clinic input]
		_asyncio.Task.uncancel

		Reset theflag returned by cancelling().
		Decrement thetask's count of cancellation requests.

		This should be used by tasks that catch CancelledError
		and wish to continue indefinitely until they are cancelled again.

		Returns theprevious value ofthe flag.
		Returns theremaining number ofcancellation requests.
		[clinic start generated code]*/

		static PyObject *
		_asyncio_Task_uncancel_impl(TaskObj *self)
		/[clinic end generated code: output=58184d236a817d3c input=5db95e28fcb6f7cd]/
		/[clinic end generated code: output=58184d236a817d3c input=68f81a4b90b46be2]/
		/[clinic end generated code]/
		{
		if (self->task_cancel_requested) {
		self->task_cancel_requested = 0;
		Py_RETURN_TRUE;
		}
		else {
		Py_RETURN_FALSE;
		if (self->task_num_cancels_requested > 0) {
		self->task_num_cancels_requested -= 1;
		}
		return PyLong_FromLong(self->task_num_cancels_requested);
		}

		/*[clinic input]
Expand Down