From 01147f4627a10ecb4db5ddcdcb4a17f5d839a627 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 26 Dec 2020 12:33:22 -0500 Subject: [PATCH] Add reference to ticket for ambiguous MRO --- src/allmydata/test/no_network.py | 2 +- src/allmydata/test/test_dirnode.py | 2 +- src/allmydata/test/test_storage_client.py | 6 +----- src/allmydata/test/web/test_web.py | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index ba497f81a..b9c9ecaeb 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -261,7 +261,7 @@ def create_no_network_client(basedir): return defer.succeed(client) -class _NoNetworkClient(_Client): # type: ignore # Cannot determine consistent MRO order +class _NoNetworkClient(_Client): # type: ignore # tahoe-lafs/ticket/3573 """ Overrides all _Client networking functionality to do nothing. """ diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py index 68fcdd54b..6866bc88e 100644 --- a/src/allmydata/test/test_dirnode.py +++ b/src/allmydata/test/test_dirnode.py @@ -1587,7 +1587,7 @@ class FakeNodeMaker(NodeMaker): def create_mutable_file(self, contents="", keysize=None, version=None): return defer.succeed(FakeMutableFile(contents)) -class FakeClient2(_Client): # type: ignore # ambiguous MRO +class FakeClient2(_Client): # type: ignore # tahoe-lafs/ticket/3573 def __init__(self): self.nodemaker = FakeNodeMaker(None, None, None, None, None, diff --git a/src/allmydata/test/test_storage_client.py b/src/allmydata/test/test_storage_client.py index f2be9ad1e..bcbfffa1e 100644 --- a/src/allmydata/test/test_storage_client.py +++ b/src/allmydata/test/test_storage_client.py @@ -91,11 +91,7 @@ from allmydata.interfaces import ( SOME_FURL = b"pb://abcde@nowhere/fake" -# type checks fail with: -# Cannot determine consistent method resolution order (MRO) for "NativeStorageServerWithVersion" -# even though class hierarchy is single-inheritance. Probably `implementer` -# wrappers are affecting the MRO. -class NativeStorageServerWithVersion(NativeStorageServer): # type: ignore +class NativeStorageServerWithVersion(NativeStorageServer): # type: ignore # tahoe-lafs/ticket/3573 def __init__(self, version): # note: these instances won't work for anything other than # get_available_space() because we don't upcall diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py index a5fbe5a51..ef0446077 100644 --- a/src/allmydata/test/web/test_web.py +++ b/src/allmydata/test/web/test_web.py @@ -189,7 +189,7 @@ class FakeHistory(object): def list_all_helper_statuses(self): return [] -class FakeDisplayableServer(StubServer): # type: ignore # Cannot determine MRO +class FakeDisplayableServer(StubServer): # type: ignore # tahoe-lafs/ticket/3573 def __init__(self, serverid, nickname, connected, last_connect_time, last_loss_time, last_rx_time): StubServer.__init__(self, serverid) @@ -255,7 +255,7 @@ class FakeStorageServer(service.MultiService): def on_status_changed(self, cb): cb(self) -class FakeClient(_Client): # type: ignore # Cannot determine MRO +class FakeClient(_Client): # type: ignore # tahoe-lafs/ticket/3573 def __init__(self): # don't upcall to Client.__init__, since we only want to initialize a # minimal subset