Cancellable and Named tasks can accept kwargs.

Author: peterhinch

PRIMITIVES.md

@@ -395,9 +395,10 @@ Constructor mandatory args:
 Constructor optional positional args:  
  * Any further positional args are passed to the coro.
 
-Constructor optional keyword arg:  
+Constructor optional keyword args:  
  * `group` Any Python object, typically integer or string. Default 0. See
  Groups below.
+ * Further keyword args are passed to the coro.
 
 Public class method:  
  * `cancel_all` Asynchronous.  
@@ -508,8 +509,9 @@ Mandatory args:
  Optional positional args:  
  * Any further positional args are passed to the coro.  
 
- Optional keyword only arg:  
+ Optional keyword only args:  
  * `barrier` A `Barrier` instance may be passed. See below.
+ * Further keyword args are passed to the coro.
 
 Public class methods:  
  * `cancel` Asynchronous.  

asyn.py

@@ -306,8 +306,8 @@ def _stopped(cls, task_no):
                 barrier.trigger()
             del cls.tasks[task_no]
 
-    def __init__(self, gf, *args, group=0):
-        task = gf(TaskId(Cancellable.task_no), *args)
+    def __init__(self, gf, *args, group=0, **kwargs):
+        task = gf(TaskId(Cancellable.task_no), *args, **kwargs)
         if task in self.tasks:
             raise ValueError('Task already exists.')
         self.tasks[Cancellable.task_no] = [task, group, None]
@@ -327,8 +327,8 @@ def __await__(self):
 # @cancellable decorator
 
 def cancellable(f):
-    def new_gen(*args):
-        g = f(*args)
+    def new_gen(*args, **kwargs):
+        g = f(*args, **kwargs)
         # Task ID is args[1] if a bound method (else args[0])
         idx = 0 if isinstance(args[0], TaskId) else 1
         task_id = args[idx]
@@ -367,10 +367,10 @@ def _stopped(cls, task_id):  # On completion remove it
             del cls.instances[name]
         Cancellable._stopped(task_id())
 
-    def __init__(self, name, gf, *args, barrier=None):
+    def __init__(self, name, gf, *args, barrier=None, **kwargs):
         if name in self.instances:
             raise ValueError('Task name "{}" already exists.'.format(name))
-        super().__init__(gf, *args, group=name)
+        super().__init__(gf, *args, group=name, **kwargs)
         self.barrier = barrier
         self.instances[name] = self
 

cantest.py

@@ -216,7 +216,8 @@ async def cant42(task_no):
 
 # Test await syntax and throwing exception to subtask
 @asyn.cancellable
-async def chained(task_id):
+async def chained(task_id, x, y, *, red, blue):
+    print('Args:', x, y, red, blue)  # Test args and kwargs
     task_no = task_id()
     try:
         await cant42(task_no)
@@ -229,7 +230,7 @@ async def run_cancel_test4():
     loop.create_task(asyn.Cancellable(cant40)())  # 3 instances in default group 0
     loop.create_task(asyn.Cancellable(cant40)())
     loop.create_task(asyn.Cancellable(cant40)())
-    loop.create_task(asyn.Cancellable(chained, group=1)())
+    loop.create_task(asyn.Cancellable(chained, 1, 2, red=3, blue=4, group=1)())
     loop.create_task(asyn.Cancellable(cant41)())  # Runs to completion
     print('Running tasks')
     await asyncio.sleep(3)
@@ -246,6 +247,7 @@ def test4():
     printexp('''Task cant41 no. 0 running, arg 5.
 Task cant41 no. 0 ended.
 Running tasks
+Args: 1 2 3 4
 Task cant42 no. 4 running
 Task cant40 no. 1 running.
 Task cant40 no. 2 running.
@@ -278,7 +280,7 @@ async def start(self, loop):
         loop.create_task(asyn.Cancellable(self.foo, 1)())  # 3 instances in default group 0
         loop.create_task(asyn.Cancellable(self.foo, 2)())
         loop.create_task(asyn.Cancellable(self.foo, 3)())
-        loop.create_task(asyn.NamedTask('my bar', self.bar, 4)())
+        loop.create_task(asyn.NamedTask('my bar', self.bar, 4, y=42)())
         await asyncio.sleep(4.5)
         await asyn.NamedTask.cancel('my bar')
         await asyn.Cancellable.cancel_all()
@@ -295,31 +297,31 @@ async def foo(self, _, arg):
             print('foo was cancelled')
 
     @asyn.cancellable
-    async def bar(self, _, arg):
+    async def bar(self, _, arg, *, x=1, y=2):
         try:
             while True:
                 await asyn.sleep(1)
-                print('bar running, arg', arg)
+                print('bar running, arg', arg, x, y)
         except asyn.StopTask:
             print('bar was cancelled')
 
 def test5():
     printexp('''foo running, arg 1
 foo running, arg 2
 foo running, arg 3
-bar running, arg 4
+bar running, arg 4 1 42
 foo running, arg 1
 foo running, arg 2
 foo running, arg 3
-bar running, arg 4
+bar running, arg 4 1 42
 foo running, arg 1
 foo running, arg 2
 foo running, arg 3
-bar running, arg 4
+bar running, arg 4 1 42
 foo running, arg 1
 foo running, arg 2
 foo running, arg 3
-bar running, arg 4
+bar running, arg 4 1 42
 foo was cancelled
 foo was cancelled
 foo was cancelled