From 9c3384fa4b3cf73380c897712539962f12828bb5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Mon, 1 Jun 2020 14:30:09 -0400 Subject: [PATCH] Get rid of use of Twisted inlineCallbacks It gets in the way of Eliot logging. --- src/_zkapauthorizer/_storage_client.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/_zkapauthorizer/_storage_client.py b/src/_zkapauthorizer/_storage_client.py index 04a465d..8566b24 100644 --- a/src/_zkapauthorizer/_storage_client.py +++ b/src/_zkapauthorizer/_storage_client.py @@ -40,7 +40,6 @@ from eliot.twisted import ( ) from twisted.internet.defer import ( - inlineCallbacks, returnValue, ) from allmydata.interfaces import ( @@ -303,7 +302,7 @@ class ZKAPAuthorizerStorageClient(object): storage_index, ) - @inlineCallbacks + @inline_callbacks @with_rref def add_lease( self, @@ -332,7 +331,7 @@ class ZKAPAuthorizerStorageClient(object): ) returnValue(result) - @inlineCallbacks + @inline_callbacks @with_rref def renew_lease( self, @@ -383,7 +382,7 @@ class ZKAPAuthorizerStorageClient(object): reason, ) - @inlineCallbacks + @inline_callbacks @with_rref def slot_testv_and_readv_and_writev( self, -- GitLab