Add init method to _LoopBoundMixin to check that loop param wasn't used

python · aeros · Nov 25, 2020 · Nov 24, 2020 · Nov 24, 2020 · Nov 25, 2020
commit 7a6156e281dad7b84548b62ad62f72b78c8c310b
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
@@ -8,18 +8,6 @@
 from . import mixins
 
 
-# Used as a sentinel for loop parameter
-_marker = object()
-
-
-def _verify_no_loop(obj, loop):
-    if loop is not _marker:
-        raise TypeError(
-            f'As of 3.10, the *loop* parameter was removed from '
-            f'{type(obj).__name__}() since it is no longer necessary'
-        )
-
-
 class _ContextManagerMixin:
     async def __aenter__(self):
         await self.acquire()
@@ -85,8 +73,8 @@ class Lock(_ContextManagerMixin, mixins._LoopBoundMixin):
 
     """
 
-    def __init__(self, *, loop=_marker):
-        _verify_no_loop(self, loop)
+    def __init__(self, *, loop=mixins._marker):
+        super().__init__(loop=loop)
         self._waiters = None
         self._locked = False
 
@@ -175,8 +163,8 @@ class Event(mixins._LoopBoundMixin):
     false.
     """
 
-    def __init__(self, loop=_marker):
-        _verify_no_loop(self, loop)
+    def __init__(self, *, loop=mixins._marker):
+        super().__init__(loop=loop)
         self._waiters = collections.deque()
         self._value = False
 
@@ -238,8 +226,8 @@ class Condition(_ContextManagerMixin, mixins._LoopBoundMixin):
     A new Lock object is created and used as the underlying lock.
     """
 
-    def __init__(self, lock=None, *, loop=_marker):
-        _verify_no_loop(self, loop)
+    def __init__(self, lock=None, *, loop=mixins._marker):
+        super().__init__(loop=loop)
         if lock is None:
             lock = Lock()
         elif lock._loop is not self._get_loop():
@@ -358,8 +346,8 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
     ValueError is raised.
     """
 
-    def __init__(self, value=1, *, loop=_marker):
-        _verify_no_loop(self, loop)
+    def __init__(self, value=1, *, loop=mixins._marker):
+        super().__init__(loop=loop)
         if value < 0:
             raise ValueError("Semaphore initial value must be >= 0")
         self._value = value
@@ -422,10 +410,9 @@ class BoundedSemaphore(Semaphore):
     above the initial value.
     """
 
-    def __init__(self, value=1, *, loop=_marker):
-        _verify_no_loop(self, loop)
+    def __init__(self, value=1, *, loop=mixins._marker):
         self._bound_value = value
-        super().__init__(value)
+        super().__init__(value, loop=loop)
 
     def release(self):
         if self._value >= self._bound_value:

diff --git a/Lib/asyncio/mixins.py b/Lib/asyncio/mixins.py
@@ -5,10 +5,20 @@
 
 _global_lock = threading.Lock()
 
+# Used as a sentinel for loop parameter
+_marker = object()
+
 
 class _LoopBoundMixin:
     _loop = None
 
+    def __init__(self, *, loop=_marker):
+        if loop is not _marker:
+            raise TypeError(
+                f'As of 3.10, the *loop* parameter was removed from '
+                f'{type(self).__name__}() since it is no longer necessary'
+            )
+
     def _get_loop(self):
         loop = events._get_running_loop()
 

diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
@@ -29,7 +29,8 @@ class Queue(mixins._LoopBoundMixin):
     interrupted between calling qsize() and doing an operation on the Queue.
     """
 
-    def __init__(self, maxsize=0):
+    def __init__(self, maxsize=0, *, loop=mixins._marker):
+        super().__init__(loop=loop)
         self._maxsize = maxsize
 
         # Futures.