Skip to content

Commit 3db5f16

Browse files
pdgendttomchy
pdgendt
authored and
tomchy
committed
[nrf fromtree] scripts: west_commands: runners: Fix f-string (UP032)
Replace .format() calls with f-strings. See https://docs.astral.sh/ruff/rules/f-string/ Signed-off-by: Pieter De Gendt <[email protected]> (cherry picked from commit 775db0e) Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent d3e09db commit 3db5f16

File tree

18 files changed

+62
-77
lines changed

18 files changed

+62
-77
lines changed

‎scripts/west_commands/runners/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ def get_runner_cls(runner):
7171
for cls in ZephyrBinaryRunner.get_runners():
7272
if cls.name() == runner:
7373
return cls
74-
raise ValueError('unknown runner "{}"'.format(runner))
74+
raise ValueError(f'unknown runner "{runner}"')
7575

7676
__all__ = ['ZephyrBinaryRunner', 'get_runner_cls']

‎scripts/west_commands/runners/blackmagicprobe.py‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,11 @@ def bmp_flash(self, command, **kwargs):
170170

171171
command = (self.gdb +
172172
['-ex', "set confirm off",
173-
'-ex', "target extended-remote {}".format(
174-
self.gdb_serial)] +
173+
'-ex', f"target extended-remote {self.gdb_serial}"] +
175174
self.connect_rst_enable_arg +
176175
['-ex', "monitor swdp_scan",
177176
'-ex', "attach 1",
178-
'-ex', "load {}".format(flash_file),
177+
'-ex', f"load {flash_file}",
179178
'-ex', "kill",
180179
'-ex', "quit",
181180
'-silent'])
@@ -192,34 +191,31 @@ def bmp_attach(self, command, **kwargs):
192191
if self.elf_file is None:
193192
command = (self.gdb +
194193
['-ex', "set confirm off",
195-
'-ex', "target extended-remote {}".format(
196-
self.gdb_serial)] +
194+
'-ex', f"target extended-remote {self.gdb_serial}"] +
197195
self.connect_rst_disable_arg +
198196
['-ex', "monitor swdp_scan",
199197
'-ex', "attach 1"])
200198
else:
201199
command = (self.gdb +
202200
['-ex', "set confirm off",
203-
'-ex', "target extended-remote {}".format(
204-
self.gdb_serial)] +
201+
'-ex', f"target extended-remote {self.gdb_serial}"] +
205202
self.connect_rst_disable_arg +
206203
['-ex', "monitor swdp_scan",
207204
'-ex', "attach 1",
208-
'-ex', "file {}".format(self.elf_file)])
205+
'-ex', f"file {self.elf_file}"])
209206
self.check_call_ignore_sigint(command)
210207

211208
def bmp_debug(self, command, **kwargs):
212209
if self.elf_file is None:
213210
raise ValueError('Cannot debug; elf file is missing')
214211
command = (self.gdb +
215212
['-ex', "set confirm off",
216-
'-ex', "target extended-remote {}".format(
217-
self.gdb_serial)] +
213+
'-ex', f"target extended-remote {self.gdb_serial}"] +
218214
self.connect_rst_enable_arg +
219215
['-ex', "monitor swdp_scan",
220216
'-ex', "attach 1",
221-
'-ex', "file {}".format(self.elf_file),
222-
'-ex', "load {}".format(self.elf_file)])
217+
'-ex', f"file {self.elf_file}",
218+
'-ex', f"load {self.elf_file}"])
223219
self.check_call_ignore_sigint(command)
224220

225221
def do_run(self, command, **kwargs):

‎scripts/west_commands/runners/canopen_program.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ def flash(self, **kwargs):
151151
if status == 0:
152152
self.downloader.swid()
153153
else:
154-
self.logger.warning('Flash status 0x{:02x}, '
155-
'skipping software identification'.format(status))
154+
self.logger.warning(f'Flash status 0x{status:02x}, '
155+
'skipping software identification')
156156

157157
self.downloader.enter_pre_operational()
158158

@@ -172,7 +172,7 @@ def flash(self, **kwargs):
172172
status = self.downloader.wait_for_flash_status_ok(self.timeout)
173173
if status != 0:
174174
raise ValueError('Program download failed: '
175-
'flash status 0x{:02x}'.format(status))
175+
f'flash status 0x{status:02x}')
176176

177177
self.downloader.swid()
178178
self.downloader.start_program()
@@ -234,7 +234,7 @@ def _ctrl_program(self, cmd):
234234
try:
235235
self.ctrl_sdo.raw = cmd
236236
except Exception as err:
237-
raise ValueError('Unable to write control command 0x{:02x}'.format(cmd)) from err
237+
raise ValueError(f'Unable to write control command 0x{cmd:02x}') from err
238238

239239
def stop_program(self):
240240
'''Write stop control command to CANopen object dictionary (0x1f51)'''
@@ -262,7 +262,7 @@ def swid(self):
262262
swid = self.swid_sdo.raw
263263
except Exception as err:
264264
raise ValueError('Failed to read software identification') from err
265-
self.logger.info('Program software identification: 0x{:08x}'.format(swid))
265+
self.logger.info(f'Program software identification: 0x{swid:08x}')
266266
return swid
267267

268268
def flash_status(self):

‎scripts/west_commands/runners/core.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ def __init__(self, cfg: RunnerConfig):
482482
self.cfg = cfg
483483
'''RunnerConfig for this instance.'''
484484

485-
self.logger = logging.getLogger('runners.{}'.format(self.name()))
485+
self.logger = logging.getLogger(f'runners.{self.name()}')
486486
'''logging.Logger for this instance.'''
487487

488488
@staticmethod
@@ -701,8 +701,7 @@ def run(self, command: str, **kwargs):
701701
This is the main entry point to this runner.'''
702702
caps = self.capabilities()
703703
if command not in caps.commands:
704-
raise ValueError('runner {} does not implement command {}'.format(
705-
self.name(), command))
704+
raise ValueError(f'runner {self.name()} does not implement command {command}')
706705
self.do_run(command, **kwargs)
707706

708707
@abc.abstractmethod

‎scripts/west_commands/runners/dfu.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ def __init__(self, cfg, dev_id, alt, img, exe='dfu-util',
2525
self.dev_id = dev_id # Used only for error checking in do_run
2626
self.alt = alt
2727
self.img = img
28-
self.cmd = [exe, '-d,{}'.format(dev_id)]
28+
self.cmd = [exe, f'-d,{dev_id}']
2929
try:
30-
self.list_pattern = ', alt={},'.format(int(self.alt))
30+
self.list_pattern = f', alt={int(self.alt)},'
3131
except ValueError:
32-
self.list_pattern = ', name="{}",'.format(self.alt)
32+
self.list_pattern = f', name="{self.alt}",'
3333

3434
if dfuse_config is None:
3535
self.dfuse = False

‎scripts/west_commands/runners/esp32.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,5 @@ def do_run(self, command, **kwargs):
132132
else:
133133
cmd_flash.extend([self.app_address, self.app_bin])
134134

135-
self.logger.info("Flashing esp32 chip on {} ({}bps)".
136-
format(self.device, self.baud))
135+
self.logger.info(f"Flashing esp32 chip on {self.device} ({self.baud}bps)")
137136
self.check_call(cmd_flash)

‎scripts/west_commands/runners/intel_cyclonev.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ def do_flash_elf(self, **kwargs):
243243
pre_init_cmd)
244244
temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
245245
gdb_cmd = (self.gdb_cmd + self.tui_arg +
246-
[temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
246+
[temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
247247

248248
gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
249-
['-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute Second Script in Build Dir
249+
['-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute Second Script in Build Dir
250250
echo = ['echo']
251251
if self.gdb_init is not None:
252252
for i in self.gdb_init:
@@ -298,16 +298,16 @@ def do_attach_debug(self, command, **kwargs):
298298
pre_init_cmd)
299299

300300
gdb_attach = (self.gdb_cmd + self.tui_arg +
301-
['-ex', 'target extended-remote :{}'.format(self.gdb_port),
301+
['-ex', f'target extended-remote :{self.gdb_port}',
302302
self.elf_name, '-q'])
303303

304304
temp_str = '--cd=' + os.environ.get('ZEPHYR_BASE') #Go to Zephyr base Dir
305305

306306
gdb_cmd = (self.gdb_cmd + self.tui_arg +
307-
[temp_str,'-ex', 'target extended-remote localhost:{}'.format(self.gdb_port) , '-batch']) #Execute First Script in Zephyr Base Dir
307+
[temp_str,'-ex', f'target extended-remote localhost:{self.gdb_port}' , '-batch']) #Execute First Script in Zephyr Base Dir
308308

309309
gdb_cmd2 = (self.gdb_cmd + self.tui_arg +
310-
['-ex', 'target extended-remote :{}'.format(self.gdb_port) , '-batch']) #Execute Second Script in Build Dir
310+
['-ex', f'target extended-remote :{self.gdb_port}' , '-batch']) #Execute Second Script in Build Dir
311311

312312

313313
if self.gdb_init is not None:

‎scripts/west_commands/runners/jlink.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ def do_add_parser(cls, parser):
125125
help='custom gdb host, defaults to the empty string '
126126
'and runs a gdb server')
127127
parser.add_argument('--gdb-port', default=DEFAULT_JLINK_GDB_PORT,
128-
help='pyocd gdb port, defaults to {}'.format(
129-
DEFAULT_JLINK_GDB_PORT))
128+
help=f'pyocd gdb port, defaults to {DEFAULT_JLINK_GDB_PORT}')
130129
parser.add_argument('--commander', default=DEFAULT_JLINK_EXE,
131130
help=f'''J-Link Commander, default is
132131
{DEFAULT_JLINK_EXE}''')
@@ -307,7 +306,7 @@ def do_run(self, command, **kwargs):
307306
client_cmd = (self.gdb_cmd +
308307
self.tui_arg +
309308
[elf_name] +
310-
['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
309+
['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
311310
if command == 'debug':
312311
client_cmd += ['-ex', 'monitor halt',
313312
'-ex', 'monitor reset',
@@ -416,7 +415,7 @@ def flash(self, **kwargs):
416415
(['-nogui', '1'] if self.supports_nogui else []) +
417416
self.tool_opt)
418417

419-
self.logger.info('Flashing file: {}'.format(flash_file))
418+
self.logger.info(f'Flashing file: {flash_file}')
420419
kwargs = {}
421420
if not self.logger.isEnabledFor(logging.DEBUG):
422421
kwargs['stdout'] = subprocess.DEVNULL

‎scripts/west_commands/runners/linkserver.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ def do_add_parser(cls, parser):
7878
help='if given, GDB uses -tui')
7979

8080
parser.add_argument('--gdb-port', default=DEFAULT_LINKSERVER_GDB_PORT,
81-
help='gdb port to open, defaults to {}'.format(
82-
DEFAULT_LINKSERVER_GDB_PORT))
81+
help=f'gdb port to open, defaults to {DEFAULT_LINKSERVER_GDB_PORT}')
8382

8483
parser.add_argument('--semihost-port', default=DEFAULT_LINKSERVER_SEMIHOST_PORT,
8584
help='semihost port to open, defaults to the empty string '
@@ -147,7 +146,7 @@ def do_run(self, command, **kwargs):
147146
gdb_cmd = ([self.gdb_cmd] +
148147
self.tui_arg +
149148
[self.elf_name] +
150-
['-ex', 'target remote {}:{}'.format(self.gdb_host, self.gdb_port)])
149+
['-ex', f'target remote {self.gdb_host}:{self.gdb_port}'])
151150

152151
if command == 'debug':
153152
gdb_cmd += [ '-ex', 'load', '-ex', 'monitor reset']

‎scripts/west_commands/runners/mdb.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def mdb_do_run(mdb_runner, command):
6868
if mdb_runner.dig_device: mdb_target += [mdb_runner.dig_device]
6969
else:
7070
# \todo: add support of other debuggers
71-
raise ValueError('unsupported jtag adapter {}'.format(mdb_runner.jtag))
71+
raise ValueError(f'unsupported jtag adapter {mdb_runner.jtag}')
7272

7373
if command == 'flash':
7474
if is_flash_cmd_need_exit_immediately(mdb_runner):
@@ -85,7 +85,7 @@ def mdb_do_run(mdb_runner, command):
8585
elif 1 < mdb_runner.cores <= 12:
8686
mdb_multifiles = '-multifiles='
8787
for i in range(mdb_runner.cores):
88-
mdb_sub_cmd = [commander] + ['-pset={}'.format(i + 1), '-psetname=core{}'.format(i)]
88+
mdb_sub_cmd = [commander] + [f'-pset={i + 1}', f'-psetname=core{i}']
8989
# -prop=download=2 is used for SMP application debug, only the 1st core
9090
# will download the shared image.
9191
if i > 0: mdb_sub_cmd += ['-prop=download=2']
@@ -100,7 +100,7 @@ def mdb_do_run(mdb_runner, command):
100100

101101
mdb_cmd = [commander] + [mdb_multifiles] + mdb_run
102102
else:
103-
raise ValueError('unsupported cores {}'.format(mdb_runner.cores))
103+
raise ValueError(f'unsupported cores {mdb_runner.cores}')
104104

105105
mdb_runner.call(mdb_cmd, cwd=mdb_runner.build_dir)
106106

0 commit comments

Comments
 (0)