Merge pull request #53 from python-trio/cancel

open_cancel_scope → CancelScope

Author: smurfix

debian/changelog

@@ -1,3 +1,11 @@
+trio-asyncio (0.10.0-1) unstable; urgency=medium
+
+  * New release
+  * Fix deprecation warnings
+  * Fix cross-references in doc
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Sun, 09 Dec 2018 10:20:44 +0100
+
 trio-asyncio (0.8.4-1) unstable; urgency=medium
 
   * Fix python_requires

debian/control

@@ -3,7 +3,7 @@ Maintainer: Matthias Urlichs <matthias@urlichs.de>
 Section: python
 Priority: optional
 Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9),
-  python3-trio (>= 0.5.0),
+  python3-trio (>= 0.10.0),
   python3-pytest-trio,
   python3-pytest-runner,
   python3-outcome,
@@ -13,7 +13,7 @@ Homepage: https://github.com/smurfix/trio-asyncio
 Package: python3-trio-asyncio
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
-  python3-trio (>= 0.5.0),
+  python3-trio (>= 0.10.0),
   python3-outcome,
 Description: Re-implementation of the asyncio mainloop on top of Trio
  trio_asyncio allows you to call asyncio code from within Trio,

setup.py

@@ -53,7 +53,7 @@
 """
 
 install_requires = [
-    "trio >= 0.9.0",
+    "trio >= 0.10.0",
     "async_generator >= 1.6",
     "outcome",
 ]

tests/interop/test_calls.py

@@ -329,7 +329,7 @@ def cancelled_future(seen):
             return f  # contains error
 
         async def check_cancel(proc, seen):
-            with trio.open_cancel_scope() as scope:
+            with trio.CancelScope() as scope:
                 with pytest.raises(asyncio.CancelledError):
                     await self.call_t_a(proc, seen, loop=loop)
             assert not scope.cancel_called
@@ -359,7 +359,7 @@ def cancelled_future(seen):
             return f  # contains error
 
         async def check_cancel(proc, seen):
-            with trio.open_cancel_scope() as scope:
+            with trio.CancelScope() as scope:
                 with pytest.raises(asyncio.CancelledError):
                     await self.call_t_a_depr(proc, seen, loop=loop)
             assert not scope.cancel_called

tests/test_misc.py

@@ -311,7 +311,7 @@ async def work_in_trio_no_matter_what(*, task_status=trio.TASK_STATUS_IGNORED):
         await trio_asyncio.aio_as_trio(work_in_asyncio)()
         try:
             # KeyboardInterrupt won't cancel this coroutine thanks to the shield
-            with trio.open_cancel_scope(shield=True):
+            with trio.CancelScope(shield=True):
                 task_status.started()
                 await asyncio_loop_closed.wait()
         finally:
@@ -323,7 +323,7 @@ async def work_in_asyncio():
         await asyncio.sleep(0)
 
     async def run_asyncio_loop(nursery, *, task_status=trio.TASK_STATUS_IGNORED):
-        with trio.open_cancel_scope() as cancel_scope:
+        with trio.CancelScope() as cancel_scope:
             try:
                 async with trio_asyncio.open_loop():
                     # Starting a coroutine from here make it inherit the access

trio_asyncio/_version.py

@@ -1,3 +1,3 @@
 # This file is imported from __init__.py and exec'd from setup.py
 
-__version__ = "0.9.1"
+__version__ = "0.10.0"

trio_asyncio/base.py

@@ -295,7 +295,7 @@ async def __run_trio(self, h):
         if f.cancelled():  # pragma: no cover
             return
         try:
-            with trio.open_cancel_scope() as scope:
+            with trio.CancelScope() as scope:
                 h._scope = scope
                 res = await proc(*args)
             if scope.cancelled_caught:
@@ -582,7 +582,7 @@ def _set_read_handle(self, fd, handle):
 
     async def _reader_loop(self, fd, handle, task_status=trio.TASK_STATUS_IGNORED):
         task_status.started()
-        with trio.open_cancel_scope() as scope:
+        with trio.CancelScope() as scope:
             handle._scope = scope
             try:
                 while not handle._cancelled:  # pragma: no branch
@@ -635,7 +635,7 @@ def _set_write_handle(self, fd, handle):
             return writer
 
     async def _writer_loop(self, fd, handle, task_status=trio.TASK_STATUS_IGNORED):
-        with trio.open_cancel_scope() as scope:
+        with trio.CancelScope() as scope:
             handle._scope = scope
             task_status.started()
             try:

trio_asyncio/handles.py

@@ -110,7 +110,7 @@ async def _call_async(self, task_status=trio.TASK_STATUS_IGNORED):
                 return
             task_status.started()
             try:
-                with trio.open_cancel_scope() as scope:
+                with trio.CancelScope() as scope:
                     self._scope = scope
                     if self._is_sync is None:
                         await self._context.run(_set_sniff, self._callback, self)
@@ -129,7 +129,7 @@ async def _call_async(self, task_status=trio.TASK_STATUS_IGNORED):
                 return
             task_status.started()
             try:
-                with trio.open_cancel_scope() as scope:
+                with trio.CancelScope() as scope:
                     self._scope = scope
                     if self._is_sync is None:
                         await self._callback(self)

trio_asyncio/sync.py

@@ -205,7 +205,7 @@ async def __trio_thread_main(self):
                     res.__cause__ = result.error.__cause__
                     result = outcome.Error(res)
                 self.__blocking_result_queue.put(result)
-            with trio.open_cancel_scope(shield=True):
+            with trio.CancelScope(shield=True):
                 await self._main_loop_exit()
             self.__blocking_result_queue.put(None)
             nursery.cancel_scope.cancel()