YAPF=0.28.0

This commit is contained in:
Ivan Kravets
2019-08-17 17:54:31 +03:00
parent 3edf7e6ca8
commit 9023358d9e
2 changed files with 7 additions and 6 deletions

View File

@ -145,10 +145,10 @@ if env.get("SIZETOOL") and "nobuild" not in COMMAND_LINE_TARGETS:
Default("checkprogsize") Default("checkprogsize")
# Print configured protocols # Print configured protocols
env.AddPreAction( env.AddPreAction(["upload", "program"],
["upload", "program"], env.VerboseAction(
env.VerboseAction(lambda source, target, env: env.PrintUploadInfo(), lambda source, target, env: env.PrintUploadInfo(),
"Configuring upload protocol...")) "Configuring upload protocol..."))
AlwaysBuild(env.Alias("debug", DEFAULT_TARGETS)) AlwaysBuild(env.Alias("debug", DEFAULT_TARGETS))
AlwaysBuild(env.Alias("__test", DEFAULT_TARGETS)) AlwaysBuild(env.Alias("__test", DEFAULT_TARGETS))

View File

@ -253,8 +253,9 @@ class GDBClient(BaseProcess): # pylint: disable=too-many-instance-attributes
return return
configuration = {"debug": self.debug_options, "env": self.env_options} configuration = {"debug": self.debug_options, "env": self.env_options}
exd = re.sub(r'\\(?!")', "/", json.dumps(configuration)) exd = re.sub(r'\\(?!")', "/", json.dumps(configuration))
exd = re.sub(r'"(?:[a-z]\:)?((/[^"/]+)+)"', lambda m: '"%s"' % join( exd = re.sub(r'"(?:[a-z]\:)?((/[^"/]+)+)"',
*m.group(1).split("/")[-2:]), exd, re.I | re.M) lambda m: '"%s"' % join(*m.group(1).split("/")[-2:]), exd,
re.I | re.M)
mp = MeasurementProtocol() mp = MeasurementProtocol()
mp['exd'] = "DebugGDBPioInitError: %s" % exd mp['exd'] = "DebugGDBPioInitError: %s" % exd
mp['exf'] = 1 mp['exf'] = 1