ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-30 09:48:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

temporarily remove new provides() usage

Browse Source
This commit is contained in:
meejah 2023-08-02 16:27:18 -06:00
parent 8b175383af
commit f663581ed3
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
integration/grid.py
View File

@ -31,10 +31,8 @@ from twisted.internet.defer import (
from twisted.internet.task import ( from twisted.internet.task import (
deferLater, deferLater,
) )
from twisted.internet.interfaces import ( from twisted.internet.protocol import ProcessProtocol # see ticket 4056
IProcessTransport, from twisted.internet.process import Process # see ticket 4056
IProcessProtocol,
)
from twisted.internet.error import ProcessTerminated from twisted.internet.error import ProcessTerminated
from allmydata.node import read_config from allmydata.node import read_config
@ -71,11 +69,17 @@ class FlogGatherer(object):
Flog Gatherer process. Flog Gatherer process.
""" """
# it would be best to use attr.validators.provides() here with the
# corresponding Twisted interface (IProcessTransport,
# IProcessProtocol) but that is deprecated; please replace with
# our own "provides" as part of
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4056#ticket
# insisting on a subclass is narrower than necessary
process = attr.ib( process = attr.ib(
validator=attr.validators.provides(IProcessTransport) validator=attr.validators.instance_of(Process)
) )
protocol = attr.ib( protocol = attr.ib(
validator=attr.validators.provides(IProcessProtocol) validator=attr.validators.instance_of(ProcessProtocol)
) )
furl = attr.ib() furl = attr.ib()
@ -155,7 +159,7 @@ class StorageServer(object):
validator=attr.validators.instance_of(TahoeProcess) validator=attr.validators.instance_of(TahoeProcess)
) )
protocol = attr.ib( protocol = attr.ib(
validator=attr.validators.provides(IProcessProtocol) validator=attr.validators.instance_of(ProcessProtocol)
) )
@inlineCallbacks @inlineCallbacks
@ -207,7 +211,7 @@ class Client(object):
validator=attr.validators.instance_of(TahoeProcess) validator=attr.validators.instance_of(TahoeProcess)
) )
protocol = attr.ib( protocol = attr.ib(
validator=attr.validators.provides(IProcessProtocol) validator=attr.validators.instance_of(ProcessProtocol)
) )
request = attr.ib() # original request, for addfinalizer() request = attr.ib() # original request, for addfinalizer()
@ -335,7 +339,7 @@ class Introducer(object):
validator=attr.validators.instance_of(TahoeProcess) validator=attr.validators.instance_of(TahoeProcess)
) )
protocol = attr.ib( protocol = attr.ib(
validator=attr.validators.provides(IProcessProtocol) validator=attr.validators.instance_of(ProcessProtocol)
) )
furl = attr.ib() furl = attr.ib()