Mailing List Archive

bpo-23819: asyncio: Replace AssertionError with TypeError where it makes sense (GH-29894)
https://github.com/python/cpython/commit/265918bb1d782ab85c7dbc835eb62d6cfc2145b7
commit: 265918bb1d782ab85c7dbc835eb62d6cfc2145b7
branch: main
author: Kumar Aditya <rahuladitya303@gmail.com>
committer: asvetlov <andrew.svetlov@gmail.com>
date: 2021-12-07T01:40:35+02:00
summary:

bpo-23819: asyncio: Replace AssertionError with TypeError where it makes sense (GH-29894)

files:
A Misc/NEWS.d/next/Library/2021-12-02-14-37-30.bpo-23819.An6vkT.rst
M Lib/asyncio/base_events.py
M Lib/asyncio/events.py
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_events.py

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 054d7b45ec2d6..cfaf082587bb2 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -706,6 +706,8 @@ def call_later(self, delay, callback, *args, context=None):
Any positional arguments after the callback will be passed to
the callback when it is called.
"""
+ if delay is None:
+ raise TypeError('delay must not be None')
timer = self.call_at(self.time() + delay, callback, *args,
context=context)
if timer._source_traceback:
@@ -717,6 +719,8 @@ def call_at(self, when, callback, *args, context=None):

Absolute time corresponds to the event loop's time() method.
"""
+ if when is None:
+ raise TypeError("when cannot be None")
self._check_closed()
if self._debug:
self._check_thread()
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 7abaaca2d2b28..d91fe8db2b020 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -101,7 +101,6 @@ class TimerHandle(Handle):
__slots__ = ['_scheduled', '_when']

def __init__(self, when, callback, args, loop, context=None):
- assert when is not None
super().__init__(callback, args, loop, context)
if self._source_traceback:
del self._source_traceback[-1]
@@ -661,7 +660,8 @@ def get_event_loop(self):
def set_event_loop(self, loop):
"""Set the event loop."""
self._local._set_called = True
- assert loop is None or isinstance(loop, AbstractEventLoop)
+ if loop is not None and not isinstance(loop, AbstractEventLoop):
+ raise TypeError(f"loop must be an instance of AbstractEventLoop or None, not '{type(loop).__name__}'")
self._local._loop = loop

def new_event_loop(self):
@@ -745,7 +745,8 @@ def set_event_loop_policy(policy):

If policy is None, the default policy is restored."""
global _event_loop_policy
- assert policy is None or isinstance(policy, AbstractEventLoopPolicy)
+ if policy is not None and not isinstance(policy, AbstractEventLoopPolicy):
+ raise TypeError(f"policy must be an instance of AbstractEventLoopPolicy or None, not '{type(policy).__name__}'")
_event_loop_policy = policy


diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index b522fac23a23b..d812bc9edea57 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -255,6 +255,8 @@ def cb():
self.assertIsInstance(h, asyncio.TimerHandle)
self.assertIn(h, self.loop._scheduled)
self.assertNotIn(h, self.loop._ready)
+ with self.assertRaises(TypeError, msg="delay must not be None"):
+ self.loop.call_later(None, cb)

def test_call_later_negative_delays(self):
calls = []
@@ -286,6 +288,8 @@ def cb():
# tolerate a difference of +800 ms because some Python buildbots
# are really slow
self.assertLessEqual(dt, 0.9, dt)
+ with self.assertRaises(TypeError, msg="when cannot be None"):
+ self.loop.call_at(None, cb)

def check_thread(self, loop, debug):
def cb():
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index e50a53d706784..fe791fa4232c0 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -2322,10 +2322,6 @@ def callback(*args):
self.assertIsNone(h._callback)
self.assertIsNone(h._args)

- # when cannot be None
- self.assertRaises(AssertionError,
- asyncio.TimerHandle, None, callback, args,
- self.loop)

def test_timer_repr(self):
self.loop.get_debug.return_value = False
@@ -2592,7 +2588,7 @@ def test_set_event_loop(self):
policy = asyncio.DefaultEventLoopPolicy()
old_loop = policy.get_event_loop()

- self.assertRaises(AssertionError, policy.set_event_loop, object())
+ self.assertRaises(TypeError, policy.set_event_loop, object())

loop = policy.new_event_loop()
policy.set_event_loop(loop)
@@ -2608,7 +2604,7 @@ def test_get_event_loop_policy(self):

def test_set_event_loop_policy(self):
self.assertRaises(
- AssertionError, asyncio.set_event_loop_policy, object())
+ TypeError, asyncio.set_event_loop_policy, object())

old_policy = asyncio.get_event_loop_policy()

diff --git a/Misc/NEWS.d/next/Library/2021-12-02-14-37-30.bpo-23819.An6vkT.rst b/Misc/NEWS.d/next/Library/2021-12-02-14-37-30.bpo-23819.An6vkT.rst
new file mode 100644
index 0000000000000..d1ec505193d41
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-12-02-14-37-30.bpo-23819.An6vkT.rst
@@ -0,0 +1 @@
+Replaced asserts with exceptions in asyncio, patch by Kumar Aditya.
\ No newline at end of file

_______________________________________________
Python-checkins mailing list
Python-checkins@python.org
https://mail.python.org/mailman/listinfo/python-checkins