From 157871c026555c4016324a901f5e8edf40f36cdf Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 2 Dec 2019 17:57:38 +0200 Subject: [PATCH] Upgrade Python syntax with pyupgrade --- src/xdist/dsession.py | 14 +++++++++----- src/xdist/looponfail.py | 2 +- src/xdist/scheduler/loadscope.py | 4 ++-- src/xdist/workermanage.py | 16 ++++++++-------- testing/test_remote.py | 4 ++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index 04e9f13..7ac5f57 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -169,7 +169,7 @@ class DSession(object): """ self.config.hook.pytest_testnodedown(node=node, error=None) if node.workeroutput["exitstatus"] == 2: # keyboard-interrupt - self.shouldstop = "%s received keyboard-interrupt" % (node,) + self.shouldstop = "{} received keyboard-interrupt".format(node) self.worker_errordown(node, "keyboard-interrupt") return if node in self.sched.nodes: @@ -321,7 +321,7 @@ class DSession(object): # XXX count no of failures and retry N times runner = self.config.pluginmanager.getplugin("runner") fspath = nodeid.split("::")[0] - msg = "worker %r crashed while running %r" % (worker.gateway.id, nodeid) + msg = "worker {!r} crashed while running {!r}".format(worker.gateway.id, nodeid) rep = runner.TestReport( nodeid, (fspath, None, fspath), (), "failed", msg, "???" ) @@ -351,7 +351,9 @@ class TerminalDistReporter(object): def getstatus(self): if self.config.option.verbose >= 0: - parts = ["%s %s" % (spec.id, self._status[spec.id]) for spec in self._specs] + parts = [ + "{} {}".format(spec.id, self._status[spec.id]) for spec in self._specs + ] return " / ".join(parts) else: return "bringing up nodes..." @@ -386,14 +388,16 @@ class TerminalDistReporter(object): def pytest_testnodeready(self, node): if self.config.option.verbose > 0: d = node.workerinfo - infoline = "[%s] Python %s" % (d["id"], d["version"].replace("\n", " -- ")) + infoline = "[{}] Python {}".format( + d["id"], d["version"].replace("\n", " -- ") + ) self.rewrite(infoline, newline=True) self.setstatus(node.gateway.spec, "ok") def pytest_testnodedown(self, node, error): if not error: return - self.write_line("[%s] node down: %s" % (node.gateway.id, error)) + self.write_line("[{}] node down: {}".format(node.gateway.id, error)) def get_default_max_worker_restart(config): diff --git a/src/xdist/looponfail.py b/src/xdist/looponfail.py index 65813b7..7f01ad6 100644 --- a/src/xdist/looponfail.py +++ b/src/xdist/looponfail.py @@ -136,7 +136,7 @@ def repr_pytest_looponfailinfo(failreports, rootdirs): tr.line(report, red=True) tr.sep("#", "waiting for changes", bold=True) for rootdir in rootdirs: - tr.line("### Watching: %s" % (rootdir,), bold=True) + tr.line("### Watching: {}".format(rootdir), bold=True) def init_worker_session(channel, args, option_dict): diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py index 426d340..6b50a48 100644 --- a/src/xdist/scheduler/loadscope.py +++ b/src/xdist/scheduler/loadscope.py @@ -358,12 +358,12 @@ class LoadScopeScheduling(object): extra_nodes = len(self.nodes) - len(self.workqueue) if extra_nodes > 0: - self.log("Shuting down {0} nodes".format(extra_nodes)) + self.log("Shuting down {} nodes".format(extra_nodes)) for _ in range(extra_nodes): unused_node, assigned = self.assigned_work.popitem(last=True) - self.log("Shuting down unused node {0}".format(unused_node)) + self.log("Shuting down unused node {}".format(unused_node)) unused_node.shutdown() # Assign initial workload diff --git a/src/xdist/workermanage.py b/src/xdist/workermanage.py index d95b481..9bc506e 100644 --- a/src/xdist/workermanage.py +++ b/src/xdist/workermanage.py @@ -101,7 +101,7 @@ class NodeManager(object): for root in candidates: root = py.path.local(root).realpath() if not root.check(): - raise pytest.UsageError("rsyncdir doesn't exist: %r" % (root,)) + raise pytest.UsageError("rsyncdir doesn't exist: {!r}".format(root)) if root not in roots: roots.append(root) return roots @@ -179,7 +179,7 @@ class HostRSync(execnet.RSync): if self._verbose: path = os.path.basename(self._sourcedir) + "/" + modified_rel_path remotepath = gateway.spec.chdir - print("%s:%s <= %s" % (gateway.spec, remotepath, path)) + print("{}:{} <= {}".format(gateway.spec, remotepath, path)) def make_reltoroot(roots, args): @@ -197,7 +197,7 @@ def make_reltoroot(roots, args): parts[0] = root.basename + "/" + x break else: - raise ValueError("arg %s not relative to an rsync root" % (arg,)) + raise ValueError("arg {} not relative to an rsync root".format(arg)) result.append(splitcode.join(parts)) return result @@ -232,7 +232,7 @@ class WorkerController(object): py.log.setconsumer(self.log._keywords, None) def __repr__(self): - return "<%s %s>" % (self.__class__.__name__, self.gateway.id) + return "<{} {}>".format(self.__class__.__name__, self.gateway.id) @property def shutting_down(self): @@ -292,11 +292,11 @@ class WorkerController(object): def sendcommand(self, name, **kwargs): """ send a named parametrized command to the other side. """ - self.log("sending command %s(**%s)" % (name, kwargs)) + self.log("sending command {}(**{})".format(name, kwargs)) self.channel.send((name, kwargs)) def notify_inproc(self, eventname, **kwargs): - self.log("queuing %s(**%s)" % (eventname, kwargs)) + self.log("queuing {}(**{})".format(eventname, kwargs)) self.putevent((eventname, kwargs)) def process_from_remote(self, eventcall): # noqa too complex @@ -318,7 +318,7 @@ class WorkerController(object): return eventname, kwargs = eventcall if eventname in ("collectionstart",): - self.log("ignoring %s(%s)" % (eventname, kwargs)) + self.log("ignoring {}({})".format(eventname, kwargs)) elif eventname == "workerready": self.notify_inproc(eventname, node=self, **kwargs) elif eventname == "workerfinished": @@ -358,7 +358,7 @@ class WorkerController(object): item=kwargs["item"], ) else: - raise ValueError("unknown event: %s" % (eventname,)) + raise ValueError("unknown event: {}".format(eventname)) except KeyboardInterrupt: # should not land in receiver-thread raise diff --git a/testing/test_remote.py b/testing/test_remote.py index c9c4e30..81d8153 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -25,7 +25,7 @@ class EventCall: self.name, self.kwargs = eventcall def __str__(self): - return "" % (self.name, self.kwargs) + return "".format(self.name, self.kwargs) class WorkerSetup: @@ -59,7 +59,7 @@ class WorkerSetup: ev = EventCall(data) if name is None or ev.name == name: return ev - print("skipping %s" % (ev,)) + print("skipping {}".format(ev)) def sendcommand(self, name, **kwargs): self.slp.sendcommand(name, **kwargs)