From c8f11dc2d3efa61ac0972c0dad53589f01837a2b Mon Sep 17 00:00:00 2001 From: tpltnt <1172976+tpltnt@users.noreply.github.com> Date: Wed, 15 May 2019 08:17:44 +0200 Subject: [PATCH 1/4] ported old-style classes to new-style --- misc/coding_tools/check-miscaptures.py | 2 +- .../provisioning/reliability.py | 4 ++-- .../provisioning/test_provisioning.py | 2 +- misc/simulators/ringsim.py | 4 ++-- misc/simulators/simulate_load.py | 2 +- misc/simulators/simulator.py | 6 ++--- misc/simulators/sizes.py | 2 +- misc/simulators/storage-overhead.py | 2 +- src/allmydata/blacklist.py | 2 +- src/allmydata/check_results.py | 2 +- src/allmydata/client.py | 4 ++-- src/allmydata/control.py | 4 ++-- src/allmydata/dirnode.py | 8 +++---- src/allmydata/frontends/auth.py | 2 +- src/allmydata/frontends/sftpd.py | 4 ++-- src/allmydata/hashtree.py | 2 +- src/allmydata/history.py | 2 +- src/allmydata/immutable/downloader/fetcher.py | 2 +- src/allmydata/immutable/downloader/finder.py | 4 ++-- src/allmydata/immutable/downloader/node.py | 6 +++-- src/allmydata/immutable/downloader/share.py | 4 ++-- src/allmydata/immutable/downloader/status.py | 24 +++++++++++++++---- src/allmydata/immutable/filenode.py | 2 +- src/allmydata/immutable/offloaded.py | 4 ++-- src/allmydata/immutable/upload.py | 6 ++--- src/allmydata/introducer/common.py | 4 ++-- src/allmydata/mutable/checker.py | 2 +- src/allmydata/mutable/filenode.py | 2 +- src/allmydata/mutable/layout.py | 2 +- src/allmydata/mutable/publish.py | 2 +- src/allmydata/mutable/repairer.py | 2 +- src/allmydata/mutable/retrieve.py | 2 +- src/allmydata/mutable/servermap.py | 4 ++-- src/allmydata/scripts/backupdb.py | 6 ++--- src/allmydata/scripts/common.py | 2 +- src/allmydata/scripts/slow_operation.py | 2 +- src/allmydata/scripts/tahoe_check.py | 4 ++-- src/allmydata/scripts/tahoe_cp.py | 22 ++++++++--------- src/allmydata/scripts/tahoe_manifest.py | 2 +- src/allmydata/storage/immutable.py | 2 +- src/allmydata/storage/lease.py | 6 ++++- src/allmydata/storage/mutable.py | 4 ++-- src/allmydata/test/bench_dirnode.py | 4 ++-- src/allmydata/test/check_grid.py | 2 +- src/allmydata/test/check_speed.py | 2 +- src/allmydata/test/cli/test_mv.py | 2 +- src/allmydata/test/common.py | 8 +++---- src/allmydata/test/common_util.py | 8 +++---- src/allmydata/test/common_web.py | 2 +- src/allmydata/test/eliotutil.py | 2 +- src/allmydata/test/mutable/test_problems.py | 6 ++--- src/allmydata/test/mutable/util.py | 10 ++++---- src/allmydata/test/no_network.py | 6 ++--- src/allmydata/test/test_checker.py | 2 +- src/allmydata/test/test_dirnode.py | 2 +- src/allmydata/test/test_download.py | 10 ++++++-- src/allmydata/test/test_filenode.py | 4 ++-- src/allmydata/test/test_introducer.py | 2 +- src/allmydata/test/test_iputil.py | 2 +- src/allmydata/test/test_node.py | 2 +- src/allmydata/test/test_repairer.py | 2 +- src/allmydata/test/test_runner.py | 4 +++- src/allmydata/test/test_sftp.py | 2 +- src/allmydata/test/test_storage.py | 12 ++++++---- src/allmydata/test/test_upload.py | 8 +++---- src/allmydata/test/test_util.py | 6 ++--- src/allmydata/test/web/test_root.py | 2 +- src/allmydata/test/web/test_web.py | 4 ++-- src/allmydata/uri.py | 2 +- src/allmydata/util/cachedir.py | 2 +- src/allmydata/util/deferredutil.py | 2 +- src/allmydata/util/fileutil.py | 4 ++-- src/allmydata/util/hashutil.py | 2 +- src/allmydata/util/limiter.py | 2 +- src/allmydata/util/observer.py | 4 ++-- src/allmydata/util/pipeline.py | 2 +- src/allmydata/util/pollmixin.py | 2 +- src/allmydata/util/spans.py | 4 ++-- src/allmydata/web/check_results.py | 4 ++-- src/allmydata/web/common.py | 2 +- src/allmydata/web/filenode.py | 2 +- src/allmydata/web/operations.py | 2 +- src/allmydata/web/status.py | 2 +- src/allmydata/windows/fixups.py | 2 +- 84 files changed, 183 insertions(+), 149 deletions(-) diff --git a/misc/coding_tools/check-miscaptures.py b/misc/coding_tools/check-miscaptures.py index c55f9fa9c..81e76f891 100644 --- a/misc/coding_tools/check-miscaptures.py +++ b/misc/coding_tools/check-miscaptures.py @@ -138,7 +138,7 @@ def report(out, path, results): print(path + (":%r %s captures %r assigned at line %d" % r), file=out) def check(sources, out): - class Counts: + class Counts(object): n = 0 processed_files = 0 suspect_files = 0 diff --git a/misc/operations_helpers/provisioning/reliability.py b/misc/operations_helpers/provisioning/reliability.py index a0d60769b..dc241b9d1 100644 --- a/misc/operations_helpers/provisioning/reliability.py +++ b/misc/operations_helpers/provisioning/reliability.py @@ -8,7 +8,7 @@ DAY=24*60*60 MONTH=31*DAY YEAR=365*DAY -class ReliabilityModel: +class ReliabilityModel(object): """Generate a model of system-wide reliability, given several input parameters. @@ -207,7 +207,7 @@ class ReliabilityModel: repair = matrix(new_repair_rows) return repair -class ReliabilityReport: +class ReliabilityReport(object): def __init__(self): self.samples = [] diff --git a/misc/operations_helpers/provisioning/test_provisioning.py b/misc/operations_helpers/provisioning/test_provisioning.py index d2b9dbd17..8835b79db 100644 --- a/misc/operations_helpers/provisioning/test_provisioning.py +++ b/misc/operations_helpers/provisioning/test_provisioning.py @@ -10,7 +10,7 @@ except ImportError: from nevow import inevow from zope.interface import implements -class MyRequest: +class MyRequest(object): implements(inevow.IRequest) pass diff --git a/misc/simulators/ringsim.py b/misc/simulators/ringsim.py index 83ed1302f..1eec7a466 100644 --- a/misc/simulators/ringsim.py +++ b/misc/simulators/ringsim.py @@ -54,7 +54,7 @@ print("average file size:", abbreviate_space(avg_filesize)) SERVER_CAPACITY = 10**12 -class Server: +class Server(object): def __init__(self, nodeid, capacity): self.nodeid = nodeid self.used = 0 @@ -75,7 +75,7 @@ class Server: else: return "<%s %s>" % (self.__class__.__name__, self.nodeid) -class Ring: +class Ring(object): SHOW_MINMAX = False def __init__(self, numservers, seed, permute): self.servers = [] diff --git a/misc/simulators/simulate_load.py b/misc/simulators/simulate_load.py index 5821ef7de..f522a6d93 100644 --- a/misc/simulators/simulate_load.py +++ b/misc/simulators/simulate_load.py @@ -8,7 +8,7 @@ import random SERVER_CAPACITY = 10**12 -class Server: +class Server(object): def __init__(self): self.si = random.randrange(0, 2**31) self.used = 0 diff --git a/misc/simulators/simulator.py b/misc/simulators/simulator.py index d0ef281db..ceeb05edf 100644 --- a/misc/simulators/simulator.py +++ b/misc/simulators/simulator.py @@ -17,7 +17,7 @@ def sha(s): def randomid(): return os.urandom(20) -class Node: +class Node(object): def __init__(self, nid, introducer, simulator): self.nid = nid self.introducer = introducer @@ -112,7 +112,7 @@ class Node: self.introducer.delete(fileid) return True -class Introducer: +class Introducer(object): def __init__(self, simulator): self.living_files = {} self.utilization = 0 # total size of all active files @@ -149,7 +149,7 @@ class Introducer: self.simulator.stamp_utilization(self.utilization) del self.living_files[fileid] -class Simulator: +class Simulator(object): NUM_NODES = 1000 EVENTS = ["ADDFILE", "DELFILE", "ADDNODE", "DELNODE"] RATE_ADDFILE = 1.0 / 10 diff --git a/misc/simulators/sizes.py b/misc/simulators/sizes.py index ca189e4e6..b55c664a5 100644 --- a/misc/simulators/sizes.py +++ b/misc/simulators/sizes.py @@ -37,7 +37,7 @@ GiB=1024*MiB TiB=1024*GiB PiB=1024*TiB -class Sizes: +class Sizes(object): def __init__(self, mode, file_size, arity=2): MAX_SEGSIZE = 128*KiB self.mode = mode diff --git a/misc/simulators/storage-overhead.py b/misc/simulators/storage-overhead.py index 547bc0adf..5a741834e 100644 --- a/misc/simulators/storage-overhead.py +++ b/misc/simulators/storage-overhead.py @@ -12,7 +12,7 @@ def roundup(size, blocksize=4096): return blocksize * mathutil.div_ceil(size, blocksize) -class BigFakeString: +class BigFakeString(object): def __init__(self, length): self.length = length self.fp = 0 diff --git a/src/allmydata/blacklist.py b/src/allmydata/blacklist.py index 23690266d..874ff95ca 100644 --- a/src/allmydata/blacklist.py +++ b/src/allmydata/blacklist.py @@ -17,7 +17,7 @@ class FileProhibited(Exception): self.reason = reason -class Blacklist: +class Blacklist(object): def __init__(self, blacklist_fn): self.blacklist_fn = blacklist_fn self.last_mtime = None diff --git a/src/allmydata/check_results.py b/src/allmydata/check_results.py index df6887a4e..068f77a25 100644 --- a/src/allmydata/check_results.py +++ b/src/allmydata/check_results.py @@ -169,7 +169,7 @@ class CheckAndRepairResults(object): return self.post_repair_results -class DeepResultsBase: +class DeepResultsBase(object): def __init__(self, root_storage_index): self.root_storage_index = root_storage_index diff --git a/src/allmydata/client.py b/src/allmydata/client.py index e521f08bc..2333a35b7 100644 --- a/src/allmydata/client.py +++ b/src/allmydata/client.py @@ -115,7 +115,7 @@ def _make_secret(): return base32.b2a(os.urandom(hashutil.CRYPTO_VAL_SIZE)) + "\n" -class SecretHolder: +class SecretHolder(object): def __init__(self, lease_secret, convergence_secret): self._lease_secret = lease_secret self._convergence_secret = convergence_secret @@ -129,7 +129,7 @@ class SecretHolder: def get_convergence_secret(self): return self._convergence_secret -class KeyGenerator: +class KeyGenerator(object): """I create RSA keys for mutable files. Each call to generate() returns a single keypair. The keysize is specified first by the keysize= argument to generate(), then with a default set by set_default_keysize(), then diff --git a/src/allmydata/control.py b/src/allmydata/control.py index 33bbe22e6..91454cbe3 100644 --- a/src/allmydata/control.py +++ b/src/allmydata/control.py @@ -38,7 +38,7 @@ def log_memory_usage(where=""): where)) @implementer(IConsumer) -class FileWritingConsumer: +class FileWritingConsumer(object): def __init__(self, filename): self.done = False self.f = open(filename, "wb") @@ -143,7 +143,7 @@ class ControlServer(Referenceable, service.Service): d.addCallback(_average) return d -class SpeedTest: +class SpeedTest(object): def __init__(self, parent, count, size, mutable): self.parent = parent self.count = count diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py index 7f90318d3..0811abc99 100644 --- a/src/allmydata/dirnode.py +++ b/src/allmydata/dirnode.py @@ -111,7 +111,7 @@ def normalize(namex): # contents and end by repacking them. It might be better to apply them to # the unpacked contents. -class Deleter: +class Deleter(object): def __init__(self, node, namex, must_exist=True, must_be_directory=False, must_be_file=False): self.node = node self.name = normalize(namex) @@ -139,7 +139,7 @@ class Deleter: return new_contents -class MetadataSetter: +class MetadataSetter(object): def __init__(self, node, namex, metadata, create_readonly_node=None): self.node = node self.name = normalize(namex) @@ -164,7 +164,7 @@ class MetadataSetter: return new_contents -class Adder: +class Adder(object): def __init__(self, node, entries=None, overwrite=True, create_readonly_node=None): self.node = node if entries is None: @@ -861,7 +861,7 @@ class ManifestWalker(DeepStats): } -class DeepChecker: +class DeepChecker(object): def __init__(self, root, verify, repair, add_lease): root_si = root.get_storage_index() if root_si: diff --git a/src/allmydata/frontends/auth.py b/src/allmydata/frontends/auth.py index 2c72a020e..49647bc60 100644 --- a/src/allmydata/frontends/auth.py +++ b/src/allmydata/frontends/auth.py @@ -16,7 +16,7 @@ class NeedRootcapLookupScheme(Exception): mechanism to translate name+passwd pairs into a rootcap, either a file of name/passwd/rootcap tuples, or a server to do the translation.""" -class FTPAvatarID: +class FTPAvatarID(object): def __init__(self, username, rootcap): self.username = username self.rootcap = rootcap diff --git a/src/allmydata/frontends/sftpd.py b/src/allmydata/frontends/sftpd.py index 400b81efb..79157322f 100644 --- a/src/allmydata/frontends/sftpd.py +++ b/src/allmydata/frontends/sftpd.py @@ -951,7 +951,7 @@ class GeneralSFTPFile(PrefixingLogMixin): return d -class StoppableList: +class StoppableList(object): def __init__(self, items): self.items = items def __iter__(self): @@ -961,7 +961,7 @@ class StoppableList: pass -class Reason: +class Reason(object): def __init__(self, value): self.value = value diff --git a/src/allmydata/hashtree.py b/src/allmydata/hashtree.py index 9ecd2f064..576d72a0e 100644 --- a/src/allmydata/hashtree.py +++ b/src/allmydata/hashtree.py @@ -68,7 +68,7 @@ def roundup_pow2(x): return ans -class CompleteBinaryTreeMixin: +class CompleteBinaryTreeMixin(object): """ Adds convenience methods to a complete binary tree. diff --git a/src/allmydata/history.py b/src/allmydata/history.py index f46eb6d4b..015b89107 100644 --- a/src/allmydata/history.py +++ b/src/allmydata/history.py @@ -1,7 +1,7 @@ import weakref -class History: +class History(object): """Keep track of recent operations, for a status display.""" name = "history" diff --git a/src/allmydata/immutable/downloader/fetcher.py b/src/allmydata/immutable/downloader/fetcher.py index ae76da876..f3cd41fe0 100644 --- a/src/allmydata/immutable/downloader/fetcher.py +++ b/src/allmydata/immutable/downloader/fetcher.py @@ -7,7 +7,7 @@ from allmydata.util.dictutil import DictOfSets from common import OVERDUE, COMPLETE, CORRUPT, DEAD, BADSEGNUM, \ BadSegmentNumberError -class SegmentFetcher: +class SegmentFetcher(object): """I am responsible for acquiring blocks for a single segment. I will use the Share instances passed to my add_shares() method to locate, retrieve, and validate those blocks. I expect my parent node to call my diff --git a/src/allmydata/immutable/downloader/finder.py b/src/allmydata/immutable/downloader/finder.py index 8bcdca76f..ad99c4647 100644 --- a/src/allmydata/immutable/downloader/finder.py +++ b/src/allmydata/immutable/downloader/finder.py @@ -20,11 +20,11 @@ def incidentally(res, f, *args, **kwargs): f(*args, **kwargs) return res -class RequestToken: +class RequestToken(object): def __init__(self, server): self.server = server -class ShareFinder: +class ShareFinder(object): OVERDUE_TIMEOUT = 10.0 def __init__(self, storage_broker, verifycap, node, download_status, diff --git a/src/allmydata/immutable/downloader/node.py b/src/allmydata/immutable/downloader/node.py index a9f36810b..1c7ecca33 100644 --- a/src/allmydata/immutable/downloader/node.py +++ b/src/allmydata/immutable/downloader/node.py @@ -23,16 +23,18 @@ class IDownloadStatusHandlingConsumer(Interface): """Record the DownloadStatus 'read event', to be updated with the time it takes to decrypt each chunk of data.""" -class Cancel: +class Cancel(object): def __init__(self, f): self._f = f self.active = True + def cancel(self): if self.active: self.active = False self._f(self) -class DownloadNode: + +class DownloadNode(object): """Internal class which manages downloads and holds state. External callers use CiphertextFileNode instead.""" diff --git a/src/allmydata/immutable/downloader/share.py b/src/allmydata/immutable/downloader/share.py index e4ed429b5..5237a7a9b 100644 --- a/src/allmydata/immutable/downloader/share.py +++ b/src/allmydata/immutable/downloader/share.py @@ -24,7 +24,7 @@ class DataUnavailable(Exception): pass -class Share: +class Share(object): """I represent a single instance of a single share (e.g. I reference the shnum2 for share SI=abcde on server xy12t, not the one on server ab45q). I am associated with a CommonShare that remembers data that is held in @@ -825,7 +825,7 @@ class Share: o.notify(state=DEAD, f=f) -class CommonShare: +class CommonShare(object): # TODO: defer creation of the hashtree until somebody uses us. There will # be a lot of unused shares, and we shouldn't spend the memory on a large # hashtree unless necessary. diff --git a/src/allmydata/immutable/downloader/status.py b/src/allmydata/immutable/downloader/status.py index 1d6246cea..fd30bc5fe 100644 --- a/src/allmydata/immutable/downloader/status.py +++ b/src/allmydata/immutable/downloader/status.py @@ -3,25 +3,32 @@ import itertools from zope.interface import implementer from allmydata.interfaces import IDownloadStatus -class ReadEvent: +class ReadEvent(object): + def __init__(self, ev, ds): self._ev = ev self._ds = ds + def update(self, bytes, decrypttime, pausetime): self._ev["bytes_returned"] += bytes self._ev["decrypt_time"] += decrypttime self._ev["paused_time"] += pausetime + def finished(self, finishtime): self._ev["finish_time"] = finishtime self._ds.update_last_timestamp(finishtime) -class SegmentEvent: + +class SegmentEvent(object): + def __init__(self, ev, ds): self._ev = ev self._ds = ds + def activate(self, when): if self._ev["active_time"] is None: self._ev["active_time"] = when + def deliver(self, when, start, length, decodetime): assert self._ev["active_time"] is not None self._ev["finish_time"] = when @@ -30,34 +37,43 @@ class SegmentEvent: self._ev["segment_start"] = start self._ev["segment_length"] = length self._ds.update_last_timestamp(when) + def error(self, when): self._ev["finish_time"] = when self._ev["success"] = False self._ds.update_last_timestamp(when) -class DYHBEvent: + +class DYHBEvent(object): + def __init__(self, ev, ds): self._ev = ev self._ds = ds + def error(self, when): self._ev["finish_time"] = when self._ev["success"] = False self._ds.update_last_timestamp(when) + def finished(self, shnums, when): self._ev["finish_time"] = when self._ev["success"] = True self._ev["response_shnums"] = shnums self._ds.update_last_timestamp(when) -class BlockRequestEvent: + +class BlockRequestEvent(object): + def __init__(self, ev, ds): self._ev = ev self._ds = ds + def finished(self, received, when): self._ev["finish_time"] = when self._ev["success"] = True self._ev["response_length"] = received self._ds.update_last_timestamp(when) + def error(self, when): self._ev["finish_time"] = when self._ev["success"] = False diff --git a/src/allmydata/immutable/filenode.py b/src/allmydata/immutable/filenode.py index ff15843a8..e8e4851bb 100644 --- a/src/allmydata/immutable/filenode.py +++ b/src/allmydata/immutable/filenode.py @@ -21,7 +21,7 @@ from allmydata.immutable.downloader.node import DownloadNode, \ IDownloadStatusHandlingConsumer from allmydata.immutable.downloader.status import DownloadStatus -class CiphertextFileNode: +class CiphertextFileNode(object): def __init__(self, verifycap, storage_broker, secret_holder, terminator, history): assert isinstance(verifycap, uri.CHKFileVerifierURI) diff --git a/src/allmydata/immutable/offloaded.py b/src/allmydata/immutable/offloaded.py index ac4bb795c..c5b402af3 100644 --- a/src/allmydata/immutable/offloaded.py +++ b/src/allmydata/immutable/offloaded.py @@ -16,7 +16,7 @@ class NotEnoughWritersError(Exception): pass -class CHKCheckerAndUEBFetcher: +class CHKCheckerAndUEBFetcher(object): """I check to see if a file is already present in the grid. I also fetch the URI Extension Block, which is useful for an uploading client who wants to avoid the work of encryption and encoding. @@ -244,7 +244,7 @@ class CHKUploadHelper(Referenceable, upload.CHKUploader): self._helper.upload_finished(self._storage_index, 0) del self._reader -class AskUntilSuccessMixin: +class AskUntilSuccessMixin(object): # create me with a _reader array _last_failure = None diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index 6720e4195..838ee85f4 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -1355,7 +1355,7 @@ def read_this_many_bytes(uploadable, size, prepend_data=[]): d.addCallback(_got) return d -class LiteralUploader: +class LiteralUploader(object): def __init__(self, progress=None): self._status = s = UploadStatus() @@ -1477,7 +1477,7 @@ class RemoteEncryptedUploadable(Referenceable): return self._eu.close() -class AssistedUploader: +class AssistedUploader(object): def __init__(self, helper, storage_broker): self._helper = helper @@ -1632,7 +1632,7 @@ class AssistedUploader: def get_upload_status(self): return self._upload_status -class BaseUploadable: +class BaseUploadable(object): # this is overridden by max_segment_size default_max_segment_size = DEFAULT_MAX_SEGMENT_SIZE default_params_set = False diff --git a/src/allmydata/introducer/common.py b/src/allmydata/introducer/common.py index a1b47e173..7ef67d652 100644 --- a/src/allmydata/introducer/common.py +++ b/src/allmydata/introducer/common.py @@ -41,7 +41,7 @@ def unsign_from_foolscap(ann_t): ann = json.loads(msg.decode("utf-8")) return (ann, key_vs) -class SubscriberDescriptor: +class SubscriberDescriptor(object): """This describes a subscriber, for status display purposes. It contains the following attributes: @@ -65,7 +65,7 @@ class SubscriberDescriptor: self.remote_address = remote_address self.tubid = tubid -class AnnouncementDescriptor: +class AnnouncementDescriptor(object): """This describes an announcement, for status display purposes. It contains the following attributes, which will be empty ("" for strings) if the client did not provide them: diff --git a/src/allmydata/mutable/checker.py b/src/allmydata/mutable/checker.py index cf073b80b..6e083f8f5 100644 --- a/src/allmydata/mutable/checker.py +++ b/src/allmydata/mutable/checker.py @@ -8,7 +8,7 @@ from allmydata.mutable.common import MODE_CHECK, MODE_WRITE, CorruptShareError from allmydata.mutable.servermap import ServerMap, ServermapUpdater from allmydata.mutable.retrieve import Retrieve # for verifying -class MutableChecker: +class MutableChecker(object): SERVERMAP_MODE = MODE_CHECK def __init__(self, node, storage_broker, history, monitor): diff --git a/src/allmydata/mutable/filenode.py b/src/allmydata/mutable/filenode.py index a1604b180..4065c25ba 100644 --- a/src/allmydata/mutable/filenode.py +++ b/src/allmydata/mutable/filenode.py @@ -24,7 +24,7 @@ from allmydata.mutable.checker import MutableChecker, MutableCheckAndRepairer from allmydata.mutable.repairer import Repairer -class BackoffAgent: +class BackoffAgent(object): # these parameters are copied from foolscap.reconnector, which gets them # from twisted.internet.protocol.ReconnectingClientFactory initialDelay = 1.0 diff --git a/src/allmydata/mutable/layout.py b/src/allmydata/mutable/layout.py index dbfde5f68..d16088994 100644 --- a/src/allmydata/mutable/layout.py +++ b/src/allmydata/mutable/layout.py @@ -1180,7 +1180,7 @@ def _handle_bad_struct(f): f.trap(struct.error) raise BadShareError(f.value.args[0]) -class MDMFSlotReadProxy: +class MDMFSlotReadProxy(object): """ I read from a mutable slot filled with data written in the MDMF data format (which is described above). diff --git a/src/allmydata/mutable/publish.py b/src/allmydata/mutable/publish.py index 629d06bd5..fcd949124 100644 --- a/src/allmydata/mutable/publish.py +++ b/src/allmydata/mutable/publish.py @@ -100,7 +100,7 @@ class PublishStatus(object): class LoopLimitExceededError(Exception): pass -class Publish: +class Publish(object): """I represent a single act of publishing the mutable file to the grid. I will only publish my data if the servermap I am using still represents the current state of the world. diff --git a/src/allmydata/mutable/repairer.py b/src/allmydata/mutable/repairer.py index 2f9377fc7..261ca9633 100644 --- a/src/allmydata/mutable/repairer.py +++ b/src/allmydata/mutable/repairer.py @@ -24,7 +24,7 @@ class RepairRequiresWritecapError(Exception): class MustForceRepairError(Exception): pass -class Repairer: +class Repairer(object): def __init__(self, node, check_results, storage_broker, history, monitor): self.node = node self.check_results = ICheckResults(check_results) diff --git a/src/allmydata/mutable/retrieve.py b/src/allmydata/mutable/retrieve.py index 3771a235c..56dcfcfb9 100644 --- a/src/allmydata/mutable/retrieve.py +++ b/src/allmydata/mutable/retrieve.py @@ -89,7 +89,7 @@ class RetrieveStatus(object): serverid = server.get_serverid() self._problems[serverid] = f -class Marker: +class Marker(object): pass @implementer(IPushProducer) diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py index 4081df65f..0c7656028 100644 --- a/src/allmydata/mutable/servermap.py +++ b/src/allmydata/mutable/servermap.py @@ -80,7 +80,7 @@ class UpdateStatus(object): def set_finished(self, when): self.finished = when -class ServerMap: +class ServerMap(object): """I record the placement of mutable shares. This object records which shares (of various versions) are located on @@ -378,7 +378,7 @@ class ServerMap: self.update_data.setdefault(shnum , []).append((verinfo, data)) -class ServermapUpdater: +class ServermapUpdater(object): def __init__(self, filenode, storage_broker, monitor, servermap, mode=MODE_READ, add_lease=False, update_range=None): """I update a servermap, locating a sufficient number of useful diff --git a/src/allmydata/scripts/backupdb.py b/src/allmydata/scripts/backupdb.py index b86a06edc..234f8524a 100644 --- a/src/allmydata/scripts/backupdb.py +++ b/src/allmydata/scripts/backupdb.py @@ -78,7 +78,7 @@ def get_backupdb(dbfile, stderr=sys.stderr, return None -class FileResult: +class FileResult(object): def __init__(self, bdb, filecap, should_check, path, mtime, ctime, size): self.bdb = bdb @@ -106,7 +106,7 @@ class FileResult: self.bdb.did_check_file_healthy(self.filecap, results) -class DirectoryResult: +class DirectoryResult(object): def __init__(self, bdb, dirhash, dircap, should_check): self.bdb = bdb self.dircap = dircap @@ -128,7 +128,7 @@ class DirectoryResult: self.bdb.did_check_directory_healthy(self.dircap, results) -class BackupDB_v2: +class BackupDB_v2(object): VERSION = 2 NO_CHECK_BEFORE = 1*MONTH ALWAYS_CHECK_AFTER = 2*MONTH diff --git a/src/allmydata/scripts/common.py b/src/allmydata/scripts/common.py index 4a94e5fd0..d3dde9a72 100644 --- a/src/allmydata/scripts/common.py +++ b/src/allmydata/scripts/common.py @@ -151,7 +151,7 @@ def get_aliases(nodedir): pass return aliases -class DefaultAliasMarker: +class DefaultAliasMarker(object): pass pretend_platform_uses_lettercolon = False # for tests diff --git a/src/allmydata/scripts/slow_operation.py b/src/allmydata/scripts/slow_operation.py index 8aa5adf12..ce25e9667 100644 --- a/src/allmydata/scripts/slow_operation.py +++ b/src/allmydata/scripts/slow_operation.py @@ -9,7 +9,7 @@ from allmydata.util.encodingutil import quote_output, is_printable_ascii import urllib import json -class SlowOperationRunner: +class SlowOperationRunner(object): def run(self, options): stderr = options.stderr diff --git a/src/allmydata/scripts/tahoe_check.py b/src/allmydata/scripts/tahoe_check.py index 19967d505..cf9391a3b 100644 --- a/src/allmydata/scripts/tahoe_check.py +++ b/src/allmydata/scripts/tahoe_check.py @@ -8,7 +8,7 @@ from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \ from allmydata.scripts.common_http import do_http, format_http_error from allmydata.util.encodingutil import quote_output, quote_path -class Checker: +class Checker(object): pass def _quote_serverid_index_share(serverid, storage_index, sharenum): @@ -111,7 +111,7 @@ def check(options): return errno return 0 -class FakeTransport: +class FakeTransport(object): disconnecting = False class DeepCheckOutput(LineOnlyReceiver): diff --git a/src/allmydata/scripts/tahoe_cp.py b/src/allmydata/scripts/tahoe_cp.py index e2c32fdfd..5d0849c56 100644 --- a/src/allmydata/scripts/tahoe_cp.py +++ b/src/allmydata/scripts/tahoe_cp.py @@ -70,7 +70,7 @@ def make_tahoe_subdirectory(nodeurl, parent_writecap, name): raise HTTPError("Error during mkdir", resp) -class LocalFileSource: +class LocalFileSource(object): def __init__(self, pathname, basename): precondition_abspath(pathname) self.pathname = pathname @@ -85,7 +85,7 @@ class LocalFileSource: def open(self, caps_only): return open(self.pathname, "rb") -class LocalFileTarget: +class LocalFileTarget(object): def __init__(self, pathname): precondition_abspath(pathname) self.pathname = pathname @@ -93,7 +93,7 @@ class LocalFileTarget: def put_file(self, inf): fileutil.put_file(self.pathname, inf) -class LocalMissingTarget: +class LocalMissingTarget(object): def __init__(self, pathname): precondition_abspath(pathname) self.pathname = pathname @@ -101,7 +101,7 @@ class LocalMissingTarget: def put_file(self, inf): fileutil.put_file(self.pathname, inf) -class LocalDirectorySource: +class LocalDirectorySource(object): def __init__(self, progressfunc, pathname, basename): precondition_abspath(pathname) @@ -133,7 +133,7 @@ class LocalDirectorySource: # TODO: output a warning pass -class LocalDirectoryTarget: +class LocalDirectoryTarget(object): def __init__(self, progressfunc, pathname): precondition_abspath(pathname) @@ -180,7 +180,7 @@ class LocalDirectoryTarget: pass -class TahoeFileSource: +class TahoeFileSource(object): def __init__(self, nodeurl, mutable, writecap, readcap, basename): self.nodeurl = nodeurl self.mutable = mutable @@ -205,7 +205,7 @@ class TahoeFileSource: def bestcap(self): return self.writecap or self.readcap -class TahoeFileTarget: +class TahoeFileTarget(object): def __init__(self, nodeurl, mutable, writecap, readcap, url): self.nodeurl = nodeurl self.mutable = mutable @@ -225,7 +225,7 @@ class TahoeFileTarget: # to always create mutable files, or to copy mutable files into new # mutable files. ticket #835 -class TahoeDirectorySource: +class TahoeDirectorySource(object): def __init__(self, nodeurl, cache, progressfunc, basename): self.nodeurl = nodeurl self.cache = cache @@ -298,7 +298,7 @@ class TahoeDirectorySource: "You probably need to use a later version of " "Tahoe-LAFS to copy this directory.") -class TahoeMissingTarget: +class TahoeMissingTarget(object): def __init__(self, url): self.url = url @@ -315,7 +315,7 @@ class TahoeMissingTarget: # I'm not sure this will always work return PUT(self.url + "?t=uri", filecap) -class TahoeDirectoryTarget: +class TahoeDirectoryTarget(object): def __init__(self, nodeurl, cache, progressfunc): self.nodeurl = nodeurl self.cache = cache @@ -459,7 +459,7 @@ FileTargets = (LocalFileTarget, TahoeFileTarget) DirectoryTargets = (LocalDirectoryTarget, TahoeDirectoryTarget) MissingTargets = (LocalMissingTarget, TahoeMissingTarget) -class Copier: +class Copier(object): def do_copy(self, options, progressfunc=None): if options['quiet']: diff --git a/src/allmydata/scripts/tahoe_manifest.py b/src/allmydata/scripts/tahoe_manifest.py index f1a5e7a99..23c0a6765 100644 --- a/src/allmydata/scripts/tahoe_manifest.py +++ b/src/allmydata/scripts/tahoe_manifest.py @@ -9,7 +9,7 @@ from allmydata.scripts.common import get_alias, DEFAULT_ALIAS, escape_path, \ from allmydata.scripts.common_http import do_http, format_http_error from allmydata.util.encodingutil import quote_output, quote_path -class FakeTransport: +class FakeTransport(object): disconnecting = False class ManifestStreamer(LineOnlyReceiver): diff --git a/src/allmydata/storage/immutable.py b/src/allmydata/storage/immutable.py index fd846c63f..f66eec594 100644 --- a/src/allmydata/storage/immutable.py +++ b/src/allmydata/storage/immutable.py @@ -36,7 +36,7 @@ from allmydata.storage.common import UnknownImmutableContainerVersionError, \ # then the value stored in this field will be the actual share data length # modulo 2**32. -class ShareFile: +class ShareFile(object): LEASE_SIZE = struct.calcsize(">L32s32sL") sharetype = "immutable" diff --git a/src/allmydata/storage/lease.py b/src/allmydata/storage/lease.py index cd176aeef..5e3e01716 100644 --- a/src/allmydata/storage/lease.py +++ b/src/allmydata/storage/lease.py @@ -1,6 +1,6 @@ import struct, time -class LeaseInfo: +class LeaseInfo(object): def __init__(self, owner_num=None, renew_secret=None, cancel_secret=None, expiration_time=None, nodeid=None): self.owner_num = owner_num @@ -14,9 +14,11 @@ class LeaseInfo: def get_expiration_time(self): return self.expiration_time + def get_grant_renew_time_time(self): # hack, based upon fixed 31day expiration period return self.expiration_time - 31*24*60*60 + def get_age(self): return time.time() - self.get_grant_renew_time_time() @@ -27,6 +29,7 @@ class LeaseInfo: self.expiration_time) = struct.unpack(">L32s32sL", data) self.nodeid = None return self + def to_immutable_data(self): return struct.pack(">L32s32sL", self.owner_num, @@ -39,6 +42,7 @@ class LeaseInfo: int(self.expiration_time), self.renew_secret, self.cancel_secret, self.nodeid) + def from_mutable_data(self, data): (self.owner_num, self.expiration_time, diff --git a/src/allmydata/storage/mutable.py b/src/allmydata/storage/mutable.py index a8392eac9..37f773c0d 100644 --- a/src/allmydata/storage/mutable.py +++ b/src/allmydata/storage/mutable.py @@ -35,7 +35,7 @@ from allmydata.mutable.layout import MAX_MUTABLE_SHARE_SIZE assert struct.calcsize(">L") == 4, struct.calcsize(">L") assert struct.calcsize(">Q") == 8, struct.calcsize(">Q") -class MutableShareFile: +class MutableShareFile(object): sharetype = "mutable" DATA_LENGTH_OFFSET = struct.calcsize(">32s20s32s") @@ -443,7 +443,7 @@ def testv_compare(a, op, b): return a > b # never reached -class EmptyShare: +class EmptyShare(object): def check_testv(self, testv): test_good = True diff --git a/src/allmydata/test/bench_dirnode.py b/src/allmydata/test/bench_dirnode.py index 2b3a11a60..9dbc61ee7 100644 --- a/src/allmydata/test/bench_dirnode.py +++ b/src/allmydata/test/bench_dirnode.py @@ -29,11 +29,11 @@ class ContainerNode(object): def is_mutable(self): return True -class FakeNode: +class FakeNode(object): def raise_error(self): return None -class FakeNodeMaker: +class FakeNodeMaker(object): def create_from_cap(self, writecap, readcap=None, deep_immutable=False, name=''): return FakeNode() diff --git a/src/allmydata/test/check_grid.py b/src/allmydata/test/check_grid.py index b47067e1e..3f5d64da2 100644 --- a/src/allmydata/test/check_grid.py +++ b/src/allmydata/test/check_grid.py @@ -72,7 +72,7 @@ class GridTesterOptions(usage.Options): class CommandFailed(Exception): pass -class GridTester: +class GridTester(object): def __init__(self, config): self.config = config self.tahoe = config.tahoe diff --git a/src/allmydata/test/check_speed.py b/src/allmydata/test/check_speed.py index c23938337..2fce53387 100644 --- a/src/allmydata/test/check_speed.py +++ b/src/allmydata/test/check_speed.py @@ -8,7 +8,7 @@ from foolscap.api import Tub, fireEventually MB = 1000000 -class SpeedTest: +class SpeedTest(object): DO_IMMUTABLE = True DO_MUTABLE_CREATE = True DO_MUTABLE = True diff --git a/src/allmydata/test/cli/test_mv.py b/src/allmydata/test/cli/test_mv.py index fa9b61cf4..9d1a64974 100644 --- a/src/allmydata/test/cli/test_mv.py +++ b/src/allmydata/test/cli/test_mv.py @@ -110,7 +110,7 @@ class Mv(GridTestMixin, CLITestMixin, unittest.TestCase): original_do_http = tahoe_mv.do_http def mock_do_http(method, url, body=""): if method == "DELETE": - class FakeResponse: + class FakeResponse(object): def read(self): return "response" resp = FakeResponse() diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py index e5f16a007..9e3be0e43 100644 --- a/src/allmydata/test/common.py +++ b/src/allmydata/test/common.py @@ -201,7 +201,7 @@ class DummyProducer(object): pass @implementer(IImmutableFileNode) -class FakeCHKFileNode: +class FakeCHKFileNode(object): """I provide IImmutableFileNode, but all of my data is stored in a class-level dictionary.""" @@ -339,7 +339,7 @@ def create_chk_filenode(contents, all_contents): @implementer(IMutableFileNode, ICheckable) -class FakeMutableFileNode: +class FakeMutableFileNode(object): """I provide IMutableFileNode, but all of my data is stored in a class-level dictionary.""" @@ -597,7 +597,7 @@ class LoggingServiceParent(service.MultiService): TEST_DATA="\x02"*(Uploader.URI_LIT_SIZE_THRESHOLD+1) -class ShouldFailMixin: +class ShouldFailMixin(object): def shouldFail(self, expected_failure, which, substring, callable, *args, **kwargs): """Assert that a function call raises some exception. This is a @@ -638,7 +638,7 @@ class ShouldFailMixin: d.addBoth(done) return d -class WebErrorMixin: +class WebErrorMixin(object): def explain_web_error(self, f): # an error on the server side causes the client-side getPage() to # return a failure(t.web.error.Error), and its str() doesn't show the diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index 91afa6814..5b3665a31 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -83,13 +83,13 @@ def flip_one_bit(s, offset=0, size=None): return result -class ReallyEqualMixin: +class ReallyEqualMixin(object): def failUnlessReallyEqual(self, a, b, msg=None): self.assertEqual(a, b, msg) self.assertEqual(type(a), type(b), "a :: %r, b :: %r, %r" % (a, b, msg)) -class NonASCIIPathMixin: +class NonASCIIPathMixin(object): def mkdir_nonascii(self, dirpath): # Kludge to work around the fact that buildbot can't remove a directory tree that has # any non-ASCII directory names on Windows. (#1472) @@ -143,13 +143,13 @@ class SignalMixin(object): signal.signal(signal.SIGCHLD, self.sigchldHandler) return super(SignalMixin, self).tearDown() -class StallMixin: +class StallMixin(object): def stall(self, res=None, delay=1): d = defer.Deferred() reactor.callLater(delay, d.callback, res) return d -class ShouldFailMixin: +class ShouldFailMixin(object): def shouldFail(self, expected_failure, which, substring, callable, *args, **kwargs): diff --git a/src/allmydata/test/common_web.py b/src/allmydata/test/common_web.py index fc8fe6e3b..791a8d9ab 100644 --- a/src/allmydata/test/common_web.py +++ b/src/allmydata/test/common_web.py @@ -6,7 +6,7 @@ from twisted.web.error import Error from nevow.testutil import FakeRequest from nevow import inevow, context -class WebRenderingMixin: +class WebRenderingMixin(object): # d=page.renderString() or s=page.renderSynchronously() will exercise # docFactory, render_*/data_* . It won't exercise want_json(), or my # renderHTTP() override which tests want_json(). To exercise args=, we diff --git a/src/allmydata/test/eliotutil.py b/src/allmydata/test/eliotutil.py index 2ba221284..f5972c929 100644 --- a/src/allmydata/test/eliotutil.py +++ b/src/allmydata/test/eliotutil.py @@ -52,7 +52,7 @@ def eliot_logged_test(f): """ # A convenient, mutable container into which nested functions can write # state to be shared among them. - class storage: + class storage(object): pass @wraps(f) diff --git a/src/allmydata/test/mutable/test_problems.py b/src/allmydata/test/mutable/test_problems.py index f2669d9e0..85f7a156e 100644 --- a/src/allmydata/test/mutable/test_problems.py +++ b/src/allmydata/test/mutable/test_problems.py @@ -19,14 +19,14 @@ from ..no_network import GridTestMixin from .. import common_util as testutil from ..common_util import DevNullDictionary -class SameKeyGenerator: +class SameKeyGenerator(object): def __init__(self, pubkey, privkey): self.pubkey = pubkey self.privkey = privkey def generate(self, keysize=None): return defer.succeed( (self.pubkey, self.privkey) ) -class FirstServerGetsKilled: +class FirstServerGetsKilled(object): done = False def notify(self, retval, wrapper, methname): if not self.done: @@ -34,7 +34,7 @@ class FirstServerGetsKilled: self.done = True return retval -class FirstServerGetsDeleted: +class FirstServerGetsDeleted(object): def __init__(self): self.done = False self.silenced = None diff --git a/src/allmydata/test/mutable/util.py b/src/allmydata/test/mutable/util.py index c09f111c4..99c039cab 100644 --- a/src/allmydata/test/mutable/util.py +++ b/src/allmydata/test/mutable/util.py @@ -21,7 +21,7 @@ def eventuaaaaaly(res=None): # network connections, both to speed up the tests and to reduce the amount of # non-mutable.py code being exercised. -class FakeStorage: +class FakeStorage(object): # this class replaces the collection of storage servers, allowing the # tests to examine and manipulate the published shares. It also lets us # control the order in which read queries are answered, to exercise more @@ -78,11 +78,13 @@ class FakeStorage: shares[shnum] = f.getvalue() -class FakeStorageServer: +class FakeStorageServer(object): + def __init__(self, peerid, storage): self.peerid = peerid self.storage = storage self.queries = 0 + def callRemote(self, methname, *args, **kwargs): self.queries += 1 def _call(): @@ -221,7 +223,7 @@ def make_nodemaker(s=None, num_peers=10, keysize=TEST_RSA_KEY_SIZE): {"k": 3, "n": 10}, SDMF_VERSION, keygen) return nodemaker -class PublishMixin: +class PublishMixin(object): def publish_one(self): # publish a file and create shares, which can then be manipulated # later. @@ -331,7 +333,7 @@ class PublishMixin: index = versionmap[shnum] shares[peerid][shnum] = oldshares[index][peerid][shnum] -class CheckerMixin: +class CheckerMixin(object): def check_good(self, r, where): self.failUnless(r.is_healthy(), where) return r diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index 1fcfab1f9..e75238c56 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -41,10 +41,10 @@ from .common import ( class IntentionalError(Exception): pass -class Marker: +class Marker(object): pass -class LocalWrapper: +class LocalWrapper(object): def __init__(self, original): self.original = original self.broken = False @@ -250,7 +250,7 @@ class _NoNetworkClient(_Client): pass #._servers will be set by the NoNetworkGrid which creates us -class SimpleStats: +class SimpleStats(object): def __init__(self): self.counters = {} self.stats_producers = [] diff --git a/src/allmydata/test/test_checker.py b/src/allmydata/test/test_checker.py index 46dec8c24..e1af90940 100644 --- a/src/allmydata/test/test_checker.py +++ b/src/allmydata/test/test_checker.py @@ -15,7 +15,7 @@ from allmydata.immutable.upload import Data from allmydata.test.common_web import WebRenderingMixin from allmydata.mutable.publish import MutableData -class FakeClient: +class FakeClient(object): def get_storage_broker(self): return self.storage_broker diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py index 488bd6052..1ec3a6f4c 100644 --- a/src/allmydata/test/test_dirnode.py +++ b/src/allmydata/test/test_dirnode.py @@ -1380,7 +1380,7 @@ class Dirnode(GridTestMixin, unittest.TestCase, self.set_up_grid(oneshare=True) return self._do_initial_children_test(mdmf=True) -class MinimalFakeMutableFile: +class MinimalFakeMutableFile(object): def get_writekey(self): return "writekey" diff --git a/src/allmydata/test/test_download.py b/src/allmydata/test/test_download.py index fa9cc9745..03e1ad56a 100644 --- a/src/allmydata/test/test_download.py +++ b/src/allmydata/test/test_download.py @@ -1287,11 +1287,12 @@ def make_servers(clientids): servers[clientid] = make_server(clientid) return servers -class MyShare: +class MyShare(object): def __init__(self, shnum, server, rtt): self._shnum = shnum self._server = server self._dyhb_rtt = rtt + def __repr__(self): return "sh%d-on-%s" % (self._shnum, self._server.get_name()) @@ -1302,21 +1303,26 @@ class MySegmentFetcher(SegmentFetcher): def _start_share(self, share, shnum): self._test_start_shares.append(share) -class FakeNode: +class FakeNode(object): def __init__(self): self.want_more = 0 self.failed = None self.processed = None self._si_prefix = "si_prefix" + def want_more_shares(self): self.want_more += 1 + def fetch_failed(self, fetcher, f): self.failed = f + def process_blocks(self, segnum, blocks): self.processed = (segnum, blocks) + def get_num_segments(self): return 1, True + class Selection(unittest.TestCase): def test_no_shares(self): node = FakeNode() diff --git a/src/allmydata/test/test_filenode.py b/src/allmydata/test/test_filenode.py index abc74981f..559beac9d 100644 --- a/src/allmydata/test/test_filenode.py +++ b/src/allmydata/test/test_filenode.py @@ -8,10 +8,10 @@ from allmydata.mutable.filenode import MutableFileNode from allmydata.util import hashutil from allmydata.util.consumer import download_to_data -class NotANode: +class NotANode(object): pass -class FakeClient: +class FakeClient(object): # just enough to let the node acquire a downloader (which it won't use), # and to get default encoding parameters def getServiceNamed(self, name): diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py index 9e5fc9bf5..8dae8fb17 100644 --- a/src/allmydata/test/test_introducer.py +++ b/src/allmydata/test/test_introducer.py @@ -716,7 +716,7 @@ class SystemTest(SystemTestMixin, AsyncTestCase): os.makedirs(self.basedir) return self.do_system_test() -class FakeRemoteReference: +class FakeRemoteReference(object): def notifyOnDisconnect(self, *args, **kwargs): pass def getRemoteTubID(self): return "62ubehyunnyhzs7r6vdonnm2hpi52w6y" def getLocationHints(self): return ["tcp:here.example.com:1234", diff --git a/src/allmydata/test/test_iputil.py b/src/allmydata/test/test_iputil.py index 71a8752ac..ebb77c3c8 100644 --- a/src/allmydata/test/test_iputil.py +++ b/src/allmydata/test/test_iputil.py @@ -86,7 +86,7 @@ WINDOWS_TEST_ADDRESSES = set(["127.0.0.1", "10.0.2.15", "192.168.0.10"]) CYGWIN_TEST_ADDRESSES = set(["127.0.0.1", "192.168.0.10"]) -class FakeProcess: +class FakeProcess(object): def __init__(self, output, err): self.output = output self.err = err diff --git a/src/allmydata/test/test_node.py b/src/allmydata/test/test_node.py index 096cd4f8f..a8a6b3743 100644 --- a/src/allmydata/test/test_node.py +++ b/src/allmydata/test/test_node.py @@ -520,7 +520,7 @@ ENABLE_HELPER = """ enabled = true """ -class FakeTub: +class FakeTub(object): def __init__(self): self.tubID = base64.b32encode("foo") self.listening_ports = [] diff --git a/src/allmydata/test/test_repairer.py b/src/allmydata/test/test_repairer.py index 9475741b4..ec521fe96 100644 --- a/src/allmydata/test/test_repairer.py +++ b/src/allmydata/test/test_repairer.py @@ -19,7 +19,7 @@ MAX_DELTA_READS = 10 * READ_LEEWAY # N = 10 timeout=240 # François's ARM box timed out after 120 seconds of Verifier.test_corrupt_crypttext_hashtree -class RepairTestMixin: +class RepairTestMixin(object): def failUnlessIsInstance(self, x, xtype): self.failUnless(isinstance(x, xtype), x) diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index 1456fdf4e..f56f5f203 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -55,7 +55,9 @@ def get_root_from_file(src): srcfile = allmydata.__file__ rootdir = get_root_from_file(srcfile) -class RunBinTahoeMixin: + +class RunBinTahoeMixin(object): + @inlineCallbacks def find_import_location(self): res = yield self.run_bintahoe(["--version-and-path"]) diff --git a/src/allmydata/test/test_sftp.py b/src/allmydata/test/test_sftp.py index 0c200d12c..06b6d1d7a 100644 --- a/src/allmydata/test/test_sftp.py +++ b/src/allmydata/test/test_sftp.py @@ -1393,7 +1393,7 @@ class Handler(GridTestMixin, ShouldFailMixin, ReallyEqualMixin, unittest.TestCas return d def test_execCommand_and_openShell(self): - class MockProtocol: + class MockProtocol(object): def __init__(self): self.output = "" self.error = "" diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py index 10e31a698..ad3fe3580 100644 --- a/src/allmydata/test/test_storage.py +++ b/src/allmydata/test/test_storage.py @@ -33,9 +33,10 @@ from allmydata.test.common_web import WebRenderingMixin from allmydata.test.no_network import NoNetworkServer from allmydata.web.storage import StorageStatus, remove_prefix -class Marker: +class Marker(object): pass -class FakeCanary: + +class FakeCanary(object): def __init__(self, ignore_disconnectors=False): self.ignore = ignore_disconnectors self.disconnectors = {} @@ -50,7 +51,7 @@ class FakeCanary: return del self.disconnectors[marker] -class FakeStatsProvider: +class FakeStatsProvider(object): def count(self, name, delta=1): pass def register_producer(self, producer): @@ -159,7 +160,7 @@ class Bucket(unittest.TestCase): result_of_read = br.remote_read(0, len(share_data)+1) self.failUnlessEqual(result_of_read, share_data) -class RemoteBucket: +class RemoteBucket(object): def __init__(self): self.read_count = 0 @@ -3052,8 +3053,9 @@ class InstrumentedLeaseCheckingCrawler(LeaseCheckingCrawler): if not self.stop_after_first_bucket: self.cpu_slice = 500 -class BrokenStatResults: +class BrokenStatResults(object): pass + class No_ST_BLOCKS_LeaseCheckingCrawler(LeaseCheckingCrawler): def stat(self, fn): s = os.stat(fn) diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index c413c9b5a..a7459c3a2 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -86,7 +86,7 @@ class Uploadable(unittest.TestCase): class ServerError(Exception): pass -class SetDEPMixin: +class SetDEPMixin(object): def set_encoding_parameters(self, k, happy, n, max_segsize=1*MiB): p = {"k": k, "happy": happy, @@ -95,7 +95,7 @@ class SetDEPMixin: } self.node.encoding_params = p -class FakeStorageServer: +class FakeStorageServer(object): def __init__(self, mode, reactor=None): self.mode = mode self.allocated = [] @@ -162,7 +162,7 @@ class FakeStorageServer: -class FakeBucketWriter: +class FakeBucketWriter(object): # a diagnostic version of storageserver.BucketWriter def __init__(self, size): self.data = StringIO() @@ -856,7 +856,7 @@ def is_happy_enough(servertoshnums, h, k): return False return True -class FakeServerTracker: +class FakeServerTracker(object): def __init__(self, serverid, buckets): self._serverid = serverid self.buckets = buckets diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index 381add043..b69cea8a3 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -1333,7 +1333,7 @@ class CacheDir(unittest.TestCase): del b2 ctr = [0] -class EqButNotIs: +class EqButNotIs(object): def __init__(self, x): self.x = x self.hash = ctr[0] @@ -1615,7 +1615,7 @@ class Log(unittest.TestCase): self.flushLoggedErrors(SampleError) -class SimpleSpans: +class SimpleSpans(object): # this is a simple+inefficient form of util.spans.Spans . We compare the # behavior of this reference model against the real (efficient) form. @@ -1943,7 +1943,7 @@ def replace(s, start, data): assert len(s) >= start+len(data) return s[:start] + data + s[start+len(data):] -class SimpleDataSpans: +class SimpleDataSpans(object): def __init__(self, other=None): self.missing = "" # "1" where missing, "0" where found self.data = "" diff --git a/src/allmydata/test/web/test_root.py b/src/allmydata/test/web/test_root.py index 727189421..1e324c398 100644 --- a/src/allmydata/test/web/test_root.py +++ b/src/allmydata/test/web/test_root.py @@ -10,7 +10,7 @@ class FakeRoot(Root): def now_fn(self): return 0 -class FakeContext: +class FakeContext(object): def __init__(self): self.slots = {} self.tag = self diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py index 120c59c31..0b41f9b5a 100644 --- a/src/allmydata/test/web/test_web.py +++ b/src/allmydata/test/web/test_web.py @@ -57,7 +57,7 @@ from ..status import FakeStatus # create a fake uploader/downloader, and a couple of fake dirnodes, then # create a webserver that works against them -class FakeStatsProvider: +class FakeStatsProvider(object): def get_stats(self): stats = {'stats': {}, 'counters': {}} return stats @@ -179,7 +179,7 @@ def build_one_ds(): return ds -class FakeHistory: +class FakeHistory(object): _all_upload_status = [upload.UploadStatus()] _all_download_status = [build_one_ds()] _all_mapupdate_statuses = [servermap.UpdateStatus()] diff --git a/src/allmydata/uri.py b/src/allmydata/uri.py index 8d462d537..051b45f79 100644 --- a/src/allmydata/uri.py +++ b/src/allmydata/uri.py @@ -707,7 +707,7 @@ class ImmutableDirectoryURIVerifier(DirectoryURIVerifier): INNER_URI_CLASS=CHKFileVerifierURI -class UnknownURI: +class UnknownURI(object): def __init__(self, uri, error=None): self._uri = uri self._error = error diff --git a/src/allmydata/util/cachedir.py b/src/allmydata/util/cachedir.py index c4902c3ed..118a8a7eb 100644 --- a/src/allmydata/util/cachedir.py +++ b/src/allmydata/util/cachedir.py @@ -35,7 +35,7 @@ class CacheDirectoryManager(service.MultiService): if now - mtime > self.old: os.remove(absfn) -class CacheFile: +class CacheFile(object): def __init__(self, absfn): self.filename = absfn diff --git a/src/allmydata/util/deferredutil.py b/src/allmydata/util/deferredutil.py index d48faa0c7..671d8bfd9 100644 --- a/src/allmydata/util/deferredutil.py +++ b/src/allmydata/util/deferredutil.py @@ -102,7 +102,7 @@ def eventual_chain(source, target): source.addCallbacks(eventually_callback(target), eventually_errback(target)) -class HookMixin: +class HookMixin(object): """ I am a helper mixin that maintains a collection of named hooks, primarily for use in tests. Each hook is set to an unfired Deferred using 'set_hook', diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index 0bb38e776..da1696f1b 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -75,7 +75,7 @@ def remove(f, tries=4, basedelay=0.1): basedelay *= 2 return os.remove(f) # The last try. -class ReopenableNamedTemporaryFile: +class ReopenableNamedTemporaryFile(object): """ This uses tempfile.mkstemp() to generate a secure temp file. It then closes the file, leaving a zero-length file as a placeholder. You can get the @@ -99,7 +99,7 @@ class ReopenableNamedTemporaryFile: def shutdown(self): remove(self.name) -class EncryptedTemporaryFile: +class EncryptedTemporaryFile(object): # not implemented: next, readline, readlines, xreadlines, writelines def __init__(self): diff --git a/src/allmydata/util/hashutil.py b/src/allmydata/util/hashutil.py index 3c57cdf6b..f5bd95ead 100644 --- a/src/allmydata/util/hashutil.py +++ b/src/allmydata/util/hashutil.py @@ -14,7 +14,7 @@ from allmydata.util.netstring import netstring # kinds. CRYPTO_VAL_SIZE=32 -class _SHA256d_Hasher: +class _SHA256d_Hasher(object): # use SHA-256d, as defined by Ferguson and Schneier: hash the output # again to prevent length-extension attacks def __init__(self, truncate_to=None): diff --git a/src/allmydata/util/limiter.py b/src/allmydata/util/limiter.py index 7ba27742c..0391ede11 100644 --- a/src/allmydata/util/limiter.py +++ b/src/allmydata/util/limiter.py @@ -2,7 +2,7 @@ from twisted.internet import defer from foolscap.api import eventually -class ConcurrencyLimiter: +class ConcurrencyLimiter(object): """I implement a basic concurrency limiter. Add work to it in the form of (callable, args, kwargs) tuples. No more than LIMIT callables will be outstanding at any one time. diff --git a/src/allmydata/util/observer.py b/src/allmydata/util/observer.py index 3dc1d2768..bcf3fd2f5 100644 --- a/src/allmydata/util/observer.py +++ b/src/allmydata/util/observer.py @@ -77,7 +77,7 @@ class LazyOneShotObserverList(OneShotObserverList): if self._watchers: # if not, don't call result_producer self._fire(self._get_result()) -class ObserverList: +class ObserverList(object): """A simple class to distribute events to a number of subscribers.""" def __init__(self): @@ -93,7 +93,7 @@ class ObserverList: for o in self._watchers: eventually(o, *args, **kwargs) -class EventStreamObserver: +class EventStreamObserver(object): """A simple class to distribute multiple events to a single subscriber. It accepts arbitrary kwargs, but no posargs.""" def __init__(self): diff --git a/src/allmydata/util/pipeline.py b/src/allmydata/util/pipeline.py index b072dc502..de4754be6 100644 --- a/src/allmydata/util/pipeline.py +++ b/src/allmydata/util/pipeline.py @@ -66,7 +66,7 @@ class ExpandableDeferredList(defer.Deferred): return f -class Pipeline: +class Pipeline(object): """I manage a size-limited pipeline of Deferred operations, usually callRemote() messages.""" diff --git a/src/allmydata/util/pollmixin.py b/src/allmydata/util/pollmixin.py index 971c543a4..14f5cd390 100644 --- a/src/allmydata/util/pollmixin.py +++ b/src/allmydata/util/pollmixin.py @@ -9,7 +9,7 @@ class TimeoutError(Exception): class PollComplete(Exception): pass -class PollMixin: +class PollMixin(object): _poll_should_ignore_these_errors = [] def poll(self, check_f, pollinterval=0.01, timeout=1000): diff --git a/src/allmydata/util/spans.py b/src/allmydata/util/spans.py index 94aef6216..1576f059a 100644 --- a/src/allmydata/util/spans.py +++ b/src/allmydata/util/spans.py @@ -1,7 +1,7 @@ from __future__ import print_function -class Spans: +class Spans(object): """I represent a compressed list of booleans, one per index (an integer). Typically, each index represents an offset into a large string, pointing to a specific byte of a share. In this context, True means that byte has @@ -222,7 +222,7 @@ def adjacent(start0, length0, start1, length1): return True return False -class DataSpans: +class DataSpans(object): """I represent portions of a large string. Equivalently, I can be said to maintain a large array of characters (with gaps of empty elements). I can be used to manage access to a remote share, where some pieces have been diff --git a/src/allmydata/web/check_results.py b/src/allmydata/web/check_results.py index d5178d476..7a9badad4 100644 --- a/src/allmydata/web/check_results.py +++ b/src/allmydata/web/check_results.py @@ -63,7 +63,7 @@ def json_check_and_repair_results(r): data["post-repair-results"] = json_check_results(post) return data -class ResultsBase: +class ResultsBase(object): # self.client must point to the Client, so we can get nicknames and # determine the permuted peer order @@ -205,7 +205,7 @@ class LiteralCheckResultsRenderer(rend.Page, ResultsBase): return T.div[T.a(href=return_to)["Return to file."]] return "" -class CheckerBase: +class CheckerBase(object): def renderHTTP(self, ctx): if self.want_json(ctx): diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py index 7909d6ad3..4c03717b3 100644 --- a/src/allmydata/web/common.py +++ b/src/allmydata/web/common.py @@ -371,7 +371,7 @@ class NeedOperationHandleError(WebError): pass -class RenderMixin: +class RenderMixin(object): def renderHTTP(self, ctx): request = IRequest(ctx) diff --git a/src/allmydata/web/filenode.py b/src/allmydata/web/filenode.py index e448e4b3b..36519948b 100644 --- a/src/allmydata/web/filenode.py +++ b/src/allmydata/web/filenode.py @@ -23,7 +23,7 @@ from allmydata.web.check_results import CheckResultsRenderer, \ CheckAndRepairResultsRenderer, LiteralCheckResultsRenderer from allmydata.web.info import MoreInfo -class ReplaceMeMixin: +class ReplaceMeMixin(object): def replace_me_with_a_child(self, req, client, replace): # a new file is being uploaded in our place. file_format = get_format(req, "CHK") diff --git a/src/allmydata/web/operations.py b/src/allmydata/web/operations.py index 21e43c9c4..74c90356a 100644 --- a/src/allmydata/web/operations.py +++ b/src/allmydata/web/operations.py @@ -120,7 +120,7 @@ class OphandleTable(rend.Page, service.Service): self.timers.pop(ophandle, None) self.handles.pop(ophandle, None) -class ReloadMixin: +class ReloadMixin(object): REFRESH_TIME = 1*MINUTE def render_refresh(self, ctx, data): diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index 5433d6c6d..9d67f6a68 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -17,7 +17,7 @@ from allmydata.web.common import ( from allmydata.interfaces import IUploadStatus, IDownloadStatus, \ IPublishStatus, IRetrieveStatus, IServermapUpdaterStatus -class RateAndTimeMixin: +class RateAndTimeMixin(object): def render_time(self, ctx, data): return abbreviate_time(data) diff --git a/src/allmydata/windows/fixups.py b/src/allmydata/windows/fixups.py index f2db8fb4c..e7f045b95 100644 --- a/src/allmydata/windows/fixups.py +++ b/src/allmydata/windows/fixups.py @@ -117,7 +117,7 @@ def initialize(): use_last_error=True )(("WriteConsoleW", windll.kernel32)) - class UnicodeOutput: + class UnicodeOutput(object): def __init__(self, hConsole, stream, fileno, name): self._hConsole = hConsole self._stream = stream From 4c2f0db5d28196e40ecf7b7e1fb5c5bb062a0836 Mon Sep 17 00:00:00 2001 From: tpltnt <1172976+tpltnt@users.noreply.github.com> Date: Sat, 11 May 2019 17:58:39 +0200 Subject: [PATCH 2/4] made OneShotObserverList a new-style class --- src/allmydata/util/observer.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/allmydata/util/observer.py b/src/allmydata/util/observer.py index bcf3fd2f5..30eb92329 100644 --- a/src/allmydata/util/observer.py +++ b/src/allmydata/util/observer.py @@ -10,7 +10,7 @@ something happens. The way this is typically implemented is that the observed has an ObserverList whose when_fired method is called in the observed's 'when_something'.""" -class OneShotObserverList: +class OneShotObserverList(object): """A one-shot event distributor.""" def __init__(self): self._fired = False @@ -18,6 +18,12 @@ class OneShotObserverList: self._watchers = [] self.__repr__ = self._unfired_repr + def __repr__(self): + """string representation of the OneshotObserverList""" + if self._fired: + return self._fired_repr() + return self._unfired_repr() + def _unfired_repr(self): return "" % (self._watchers, ) From 14453f2aea01311e4cb0b46069217c44ac9303a8 Mon Sep 17 00:00:00 2001 From: tpltnt <1172976+tpltnt@users.noreply.github.com> Date: Mon, 13 May 2019 08:05:12 +0200 Subject: [PATCH 3/4] added newsfragment about porting classes --- newsfragments/3042.other | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/3042.other diff --git a/newsfragments/3042.other b/newsfragments/3042.other new file mode 100644 index 000000000..5759b9145 --- /dev/null +++ b/newsfragments/3042.other @@ -0,0 +1 @@ +All old-style classes ported to new-style. \ No newline at end of file From e2b0b99e13e36b997f5373212f0cd934d60c76d9 Mon Sep 17 00:00:00 2001 From: tpltnt <1172976+tpltnt@users.noreply.github.com> Date: Sun, 26 May 2019 09:39:09 +0200 Subject: [PATCH 4/4] added old-style classes regression test --- .../test/test_python2_regressions.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/allmydata/test/test_python2_regressions.py diff --git a/src/allmydata/test/test_python2_regressions.py b/src/allmydata/test/test_python2_regressions.py new file mode 100644 index 000000000..f2b372e03 --- /dev/null +++ b/src/allmydata/test/test_python2_regressions.py @@ -0,0 +1,31 @@ +""" +Tests to check for Python2 regressions +""" +from twisted.trial import unittest +from twisted.python.modules import getModule + +class PythonTwoRegressions(unittest.TestCase): + """ + A test class to hold Python2 regression tests. + """ + + def is_new_style(self, cls): + """check for being a new-style class""" + # another test could be: issubclass(value, type) + has_class_attr = hasattr(cls, '__class__') + dict_or_slots = '__dict__' in dir(cls) or hasattr(cls, '__slots__') + return has_class_attr and dict_or_slots + + def test_old_style_class(self): + """ + Check if all classes are new-style classes + """ + for mod in getModule("allmydata").walkModules(): + for attr in mod.iterAttributes(): + value = attr.load() + if isinstance(value, str): + # apparently strings are note a new-style class (in Python 2.7) + # so we skip testing them + return + self.assertTrue(self.is_new_style(value), + "{} does not seem to be a new-style class".format(attr.name))