From ded438f8d1be3337537f4b06e4e8f627852caa93 Mon Sep 17 00:00:00 2001 From: Matthias Urlichs Date: Thu, 5 Jan 2023 11:21:22 +0100 Subject: [PATCH] more anyio4 --- async_amqp/future.py | 4 ---- tests/testcase.py | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/async_amqp/future.py b/async_amqp/future.py index 875ad47..687e5f2 100644 --- a/async_amqp/future.py +++ b/async_amqp/future.py @@ -5,7 +5,6 @@ import anyio import logging import outcome -from anyio._core._compat import DeprecatedAwaitable logger = logging.getLogger(__name__) @@ -31,7 +30,6 @@ def set_result(self, value): raise RuntimeError("future already set") self.result = outcome.Value(value) self.event.set() - return DeprecatedAwaitable(self.set_result) def set_exception(self, exc): if self.event.is_set(): @@ -40,14 +38,12 @@ def set_exception(self, exc): exc = exc() self.result = outcome.Error(exc) self.event.set() - return DeprecatedAwaitable(self.set_exception) def cancel(self): try: raise FutureCancelled() except FutureCancelled as exc: self.set_exception(exc) - return DeprecatedAwaitable(self.cancel) def done(self): return self.event.is_set() diff --git a/tests/testcase.py b/tests/testcase.py index 4b58efd..cbcc58d 100644 --- a/tests/testcase.py +++ b/tests/testcase.py @@ -137,7 +137,6 @@ def __init__(self, scope): def cancel(self): self.scope.cancel() - return DeprecatedAwaitable(self.cancel) class TaskGroup: @@ -212,7 +211,7 @@ async def stop(self): if amqp.state != OPEN: continue logger.debug('Kill off amqp %s', amqp) - await amqp._nursery.cancel_scope.cancel() + amqp._nursery.cancel_scope.cancel() await amqp.close() def teardown(self):