adapt to asynckivy 0.6.0

examples/customizing_animation_ver2.py

@@ -9,8 +9,7 @@
 from kivy.graphics import Rotate, Scale
 
 import asynckivy as ak
-from asynckivy import vanim
-from asynckivy.utils import transform
+from asynckivy import vanim, transform
 
 from kivy_garden.draggable import KXDroppableBehavior, KXDraggableBehavior
 

examples/shopping.py

@@ -201,12 +201,12 @@ async def _init_database(conn: sqlite3.Connection):
             # FIXME: The Session object may not be thread-safe so it's probably better not to share it between threads...
             with ThreadPoolExecutor() as executer, requests.Session() as session:
                 async def download_one_image(name, image_url) -> Tuple[bytes, str]:
-                    image = await ak.run_in_executer(lambda: session.get(image_url).content, executer)
+                    image = await ak.run_in_executor(executer, lambda: session.get(image_url).content)
                     return (image, name)
-                tasks = await ak.and_from_iterable(
+                tasks = await ak.wait_all(*(
                     download_one_image(name, image_url)
                     for name, image_url in cur.execute("SELECT name, image_url FROM Foods")
-                )
+                ))
 
             # save images
             cur.executemany(

src/kivy_garden/draggable/_impl.py

@@ -107,7 +107,7 @@ async def _see_if_a_touch_actually_is_a_dragging_gesture(self, touch):
             ak.sleep(self.drag_timeout / 1000.),
             self._true_when_a_touch_ended_false_when_it_moved_too_much(touch),
         )
-        if tasks[0].done:
+        if tasks[0].finished:
             # The given touch is a dragging gesture.
             if self._can_be_dragged:
                 await self._treat_a_touch_as_a_drag(touch, do_transform=True)
@@ -187,7 +187,7 @@ async def _treat_a_touch_as_a_drag(self, touch, *, do_transform=False, touch_rec
 
             # store the task object so that the user can cancel it
             self._drag_task.cancel()
-            self._drag_task = await ak.get_current_task()
+            self._drag_task = await ak.current_task()
 
             # actual dragging process
             self.dispatch('on_drag_start', touch, ctx)
@@ -207,11 +207,11 @@ async def _treat_a_touch_as_a_drag(self, touch, *, do_transform=False, touch_rec
             else:
                 r = self.dispatch('on_drag_succeed', touch, ctx)
                 self.drag_state = 'succeeded'
-            async with ak.cancel_protection():
+            async with ak.disable_cancellation():
                 if isawaitable(r):
                     await r
                 await ak.sleep(-1)  # This is necessary in order to work with Magnet iirc.
-        except GeneratorExit:
+        except ak.Cancelled:
             self.dispatch('on_drag_cancel', touch, ctx)
             self.drag_state = 'cancelled'
             raise