This is an archive of the discontinued LLVM Phabricator instance.

Differential D91205

Update string formatting for AnnotatedCommand to support Python >3.7.
ClosedPublic

Authored by vvereschaka on Nov 10 2020, 1:41 PM.

Details

Reviewers
gkistanova
Commits
rZORG6911944e3a24: Update string formatting for AnnotatedCommand to support Python >3.7.
Summary

Replaced %s/%r with format {} sequences.

Diff Detail

Event Timeline

vvereschaka requested review of this revision.Nov 10 2020, 1:41 PM
vvereschaka created this revision.
gkistanova accepted this revision.Nov 30 2020, 6:09 PM

LGTM

This revision is now accepted and ready to land.Nov 30 2020, 6:09 PM
vvereschaka closed this revision.Dec 27 2021, 5:10 PM

Updated with revision id 6911944e3a24864c6560733310c1047af9a9f5a6

vvereschaka added a commit: rZORG6911944e3a24: Update string formatting for AnnotatedCommand to support Python >3.7..Dec 27 2021, 5:18 PM

Revision Contents

PathSize
zorg/
buildbot/
commands/
38 lines

Diff 304320

zorg/buildbot/commands/AnnotatedCommand.py

Context not available.
@defer.inlineCallbacks @defer.inlineCallbacks
def addStep(self): def addStep(self):
debuglog("AnnotatedBuildStep: adding step '%s': buildid=%s" % ( debuglog("AnnotatedBuildStep: adding step '{}': buildid={}".format(
self.name, self.build.buildid)) self.name, self.build.buildid))
yield buildstep.BuildStep.addStep(self) yield buildstep.BuildStep.addStep(self)
# Put ourselves into a list of processed steps of the build object. # Put ourselves into a list of processed steps of the build object.
Context not available.
self.description = [self.name] self.description = [self.name]
self.stdio_log = yield self.addLog('stdio') self.stdio_log = yield self.addLog('stdio')
debuglog("AnnotatedBuildStep: added step '%s': stepid=%s, buildid=%s" % ( debuglog("AnnotatedBuildStep: added step '{}': stepid={}, buildid={}".format(
self.name, self.stepid, self.build.buildid)) self.name, self.stepid, self.build.buildid))
@defer.inlineCallbacks @defer.inlineCallbacks
def finishStep(self): def finishStep(self):
hidden = False hidden = False
debuglog("AnnotatedBuildStep: finish step '%s': stepid=%s, buildid=%s, results=%s" % ( debuglog("AnnotatedBuildStep: finish step '{}': stepid={}, buildid={}, results={}".format(
self.name, self.stepid, self.build.buildid, self.results)) self.name, self.stepid, self.build.buildid, self.results))
yield self.master.data.updates.finishStep(self.stepid, self.results, yield self.master.data.updates.finishStep(self.stepid, self.results,
hidden) hidden)
Context not available.
@defer.inlineCallbacks @defer.inlineCallbacks
def startStep(self, remote, done=False): def startStep(self, remote, done=False):
debuglog("AnnotatedBuildStep::startStep() starting '%s': " debuglog("AnnotatedBuildStep::startStep() starting '{}': "
"buildid=%s, done=%s" % ( "buildid={}, done={}".format(
self.name, self.build.buildid, done)) self.name, self.build.buildid, done))
try: try:
Context not available.
# Update step status in the database. # Update step status in the database.
yield self.finishStep() yield self.finishStep()
debuglog("AnnotatedBuildStep::startStep() completed '%s': " debuglog("AnnotatedBuildStep::startStep() completed '{}': "
"stepid=%s, buildid=%s, results=%s" % ( "stepid={}, buildid={}, results={}".format(
self.name, self.stepid, self.build.buildid, self.results)) self.name, self.stepid, self.build.buildid, self.results))
def requestFinish(self, status=None): def requestFinish(self, status=None):
debuglog("AnnotatedBuildStep::requestFinish(%r): '%s': " debuglog("AnnotatedBuildStep::requestFinish({}): '{}': "
"stepid=%s, buildid=%s, results=%r" % ( "stepid={}, buildid={}, results={}".format(
status, self.name, self.stepid, self.build.buildid, self.results)) status, self.name, self.stepid, self.build.buildid, self.results))
# Update the current step status with the worst result. # Update the current step status with the worst result.
if status is not None: if status is not None:
Context not available.
@defer.inlineCallbacks @defer.inlineCallbacks
def run(self): def run(self):
debuglog("AnnotatedBuildStep::run() starting '%s' step: " debuglog("AnnotatedBuildStep::run() starting '{}' step: "
"stepid=%s, buildid=%s" % ( "stepid={}, buildid={}".format(
self.name, self.stepid, self.build.buildid)) self.name, self.stepid, self.build.buildid))
# Save previously collected log lines. # Save previously collected log lines.
Context not available.
if self._loglines: if self._loglines:
yield self._flushLogs() yield self._flushLogs()
debuglog("AnnotatedBuildStep::run() exiting '%s' step: " debuglog("AnnotatedBuildStep::run() exiting '{}' step: "
"stepid=%s, buildid=%s, results=%s" % ( "stepid={}, buildid={}, results={}".format(
self.name, self.stepid, self.build.buildid, self.results)) self.name, self.stepid, self.build.buildid, self.results))
return self.results return self.results
Context not available.
return self.annotated_steps[-1] if self.annotated_steps else None return self.annotated_steps[-1] if self.annotated_steps else None
def _updateLastAnnotatedStepStatus(self, status): def _updateLastAnnotatedStepStatus(self, status):
debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepStatus(%r)" % status) debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepStatus({})".format(status))
# Alway update the common annotate command status. # Alway update the common annotate command status.
self.annotate_status = results.worst_status(self.annotate_status, status) self.annotate_status = results.worst_status(self.annotate_status, status)
Context not available.
def _updateLastAnnotatedStepText(self, text = None): def _updateLastAnnotatedStepText(self, text = None):
"""Updating a step text. None to clean up.""" """Updating a step text. None to clean up."""
debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepText('%s')" % (text if text else '')) debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepText('{}')".format(
text if text else ''))
s = self._getLastAnnotatedStep() s = self._getLastAnnotatedStep()
if s is not None: if s is not None:
Context not available.
def _updateLastAnnotatedStepSummaryInfo(self, text = None): def _updateLastAnnotatedStepSummaryInfo(self, text = None):
"""Updating a step summary info. None to clean up.""" """Updating a step summary info. None to clean up."""
debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepSummaryInfo('%s')" % (text if text else '')) debuglog(">>> AnnotatedCommand::_updateLastAnnotatedStepSummaryInfo('{}')".format(
text if text else ''))
s = self._getLastAnnotatedStep() s = self._getLastAnnotatedStep()
if s is not None: if s is not None:
Context not available.
s.requestFinish() s.requestFinish()
def _scheduleNewAnnotatedStep(self, name, logline): def _scheduleNewAnnotatedStep(self, name, logline):
debuglog(">>> AnnotatedCommand::_scheduleNewAnnotatedStep('%s')" % name) debuglog(">>> AnnotatedCommand::_scheduleNewAnnotatedStep('{}')".format(name))
self._fixupActiveAnnotatedStep() self._fixupActiveAnnotatedStep()
Context not available.
ancmd, args = parse_annotate_cmd(line) ancmd, args = parse_annotate_cmd(line)
if ancmd: if ancmd:
debuglog(">>> AnnotatedCommand::processAnnotatedCommand(): %s, %r" % (ancmd, args)) debuglog(">>> AnnotatedCommand::processAnnotatedCommand(): {}, {}".format(ancmd, args))
try: try:
if ancmd == STEP_LINK: if ancmd == STEP_LINK:
Context not available.