Skip to content

Commit 9c8d0cf

Browse files
fixes
1 parent 2caaffc commit 9c8d0cf

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Lib/asyncio/base_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,7 @@ def call_exception_handler(self, context):
19401940

19411941
def _add_callback(self, handle):
19421942
"""Add a Handle to _ready."""
1943-
if not handle.cancelled():
1943+
if not handle._cancelled:
19441944
self._ready.append(handle)
19451945

19461946
def _add_callback_signalsafe(self, handle):
@@ -1969,7 +1969,7 @@ def _run_once(self):
19691969
# is too high
19701970
new_scheduled = []
19711971
for handle in self._scheduled:
1972-
if handle.cancelled():
1972+
if handle._cancelled:
19731973
handle._scheduled = False
19741974
else:
19751975
new_scheduled.append(handle)
@@ -2019,7 +2019,7 @@ def _run_once(self):
20192019
ntodo = len(self._ready)
20202020
for i in range(ntodo):
20212021
handle = self._ready.popleft()
2022-
if handle.cancelled():
2022+
if handle._cancelled:
20232023
continue
20242024
if self._debug:
20252025
try:

Lib/asyncio/events.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ def cancelled(self):
129129

130130
def _run(self):
131131
with self._lock:
132+
if self._cancelled:
133+
return
132134
return super()._run()
133135

134136

Lib/asyncio/unix_events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def _handle_signal(self, sig):
138138
handle = self._signal_handlers.get(sig)
139139
if handle is None:
140140
return # Assume it's some race condition.
141-
if handle.cancelled():
141+
if handle._cancelled:
142142
self.remove_signal_handler(sig) # Remove it properly.
143143
else:
144144
self._add_callback_signalsafe(handle)

Lib/test/test_asyncio/test_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,11 +1810,11 @@ def call_later(delay, callback, *args):
18101810
loop.call_later = call_later
18111811
test_utils.run_briefly(loop)
18121812

1813-
self.assertFalse(handle.cancelled())
1813+
self.assertFalse(handle._cancelled)
18141814

18151815
t.cancel()
18161816
test_utils.run_briefly(loop)
1817-
self.assertTrue(handle.cancelled())
1817+
self.assertTrue(handle._cancelled)
18181818

18191819
def test_task_cancel_sleeping_task(self):
18201820

0 commit comments

Comments
 (0)