* trio.hazmat.Result is deprecated.

Author: smurfix

debian/changelog

@@ -1,3 +1,9 @@
+trio-asyncio (0.7.5-1) unstable; urgency=medium
+
+  * trio.hazmat.Result is deprecated.
+
+ -- Matthias Urlichs <matthias@urlichs.de>  Mon, 23 Jul 2018 20:54:55 +0200
+
 trio-asyncio (0.7.4-5) unstable; urgency=medium
 
   * Debianization

trio_asyncio/_version.py

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

trio_asyncio/child.py

@@ -2,6 +2,7 @@
 import sys
 import threading
 import weakref
+import outcome
 
 import trio
 
@@ -37,7 +38,8 @@ def _compute_returncode(status):
         raise UnknownStatus(status)
 
 
-NOT_FOUND = trio.hazmat.Error(ChildProcessError())
+def NOT_FOUND():
+    return outcome.Error(ChildProcessError())
 
 
 class ProcessWaiter:
@@ -131,7 +133,7 @@ def _wait_pid(self, blocking):
             except ChildProcessError:
                 # The child process may already be reaped
                 # (may happen if waitpid() is called elsewhere).
-                self.__result = NOT_FOUND
+                self.__result = NOT_FOUND()
             else:
                 if pid == 0:
                     # The child process is still alive.
@@ -141,7 +143,7 @@ def _wait_pid(self, blocking):
 
         def _handle_exitstatus(self, sts):
             """This overrides an internal API of subprocess.Popen"""
-            self.__result = trio.hazmat.Result.capture(_compute_returncode, sts)
+            self.__result = outcome.capture(_compute_returncode, sts)
 
     @property
     def returncode(self):

trio_asyncio/sync.py

@@ -2,6 +2,7 @@
 import queue
 import asyncio
 import threading
+import outcome
 
 from .base import BaseTrioEventLoop
 from .handles import Handle
@@ -135,7 +136,7 @@ async def _run_coroutine(self, future):
         def is_done(_):
             nonlocal result
 
-            result = trio.hazmat.Result.capture(future.result)
+            result = outcome.capture(future.result)
             self.stop()
 
         future.add_done_callback(is_done)
@@ -198,11 +199,11 @@ async def __trio_thread_main(self):
                     break
                 async_fn, args = req
 
-                result = await trio.hazmat.Result.acapture(async_fn, *args)
-                if type(result) == trio.hazmat.Error and type(result.error) == trio.Cancelled:
+                result = await outcome.acapture(async_fn, *args)
+                if type(result) == outcome.Error and type(result.error) == trio.Cancelled:
                     res = RuntimeError("Main loop cancelled")
                     res.__cause__ = result.error.__cause__
-                    result = trio.hazmat.Error(res)
+                    result = outcome.Error(res)
                 self.__blocking_result_queue.put(result)
             with trio.open_cancel_scope(shield=True):
                 await self._main_loop_exit()

trio_asyncio/util.py

@@ -4,6 +4,7 @@
 import trio
 import asyncio
 import sys
+import outcome
 from async_generator import async_generator, yield_
 
 __all__ = ['run_future']
@@ -20,7 +21,7 @@ async def run_future(future):
     raise_cancel = None
 
     def done_cb(_):
-        trio.hazmat.reschedule(task, trio.hazmat.Result.capture(future.result))
+        trio.hazmat.reschedule(task, outcome.capture(future.result))
 
     future.add_done_callback(done_cb)
 
@@ -60,14 +61,14 @@ async def run_generator(loop, async_generator):
     async def consume_next():
         try:
             item = await async_generator.__anext__()
-            result = trio.hazmat.Value(value=item)
+            result = outcome.Value(value=item)
         except StopAsyncIteration:
-            result = trio.hazmat.Value(value=STOP)
+            result = outcome.Value(value=STOP)
         except asyncio.CancelledError:
             # Once we are cancelled, we do not call reschedule() anymore
             return
         except Exception as e:
-            result = trio.hazmat.Error(error=e)
+            result = outcome.Error(error=e)
 
         trio.hazmat.reschedule(task, result)