Skip to content

Commit 8ead869

Browse files
committed
west: runners: openocd: mitigate pylint R0201 warning
Previously, there was a warning that the to_num() method can (and probably should) be unbound from OpenOcdBinaryRunner. Signed-off-by: Chris Friedt <[email protected]>
1 parent 08ddf3e commit 8ead869

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

scripts/west_commands/runners/openocd.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@
2929
DEFAULT_OPENOCD_RESET_HALT_CMD = 'reset init'
3030
DEFAULT_OPENOCD_TARGET_HANDLE = "_TARGETNAME"
3131

32+
def to_num(number):
33+
dev_match = re.search(r"^\d*\+dev", number)
34+
dev_version = dev_match is not None
35+
36+
num_match = re.search(r"^\d*", number)
37+
num = int(num_match.group(0))
38+
39+
if dev_version:
40+
num += 1
41+
42+
return num
43+
3244
class OpenOcdBinaryRunner(ZephyrBinaryRunner):
3345
'''Runner front-end for openocd.'''
3446

@@ -200,19 +212,6 @@ def print_gdbserver_message(self):
200212
self.logger.info('OpenOCD GDB server running on port '
201213
f'{self.gdb_port}{thread_msg}')
202214

203-
# pylint: disable=R0201
204-
def to_num(self, number):
205-
dev_match = re.search(r"^\d*\+dev", number)
206-
dev_version = not dev_match is None
207-
208-
num_match = re.search(r"^\d*", number)
209-
num = int(num_match.group(0))
210-
211-
if dev_version:
212-
num += 1
213-
214-
return num
215-
216215
def read_version(self):
217216
self.require(self.openocd_cmd[0])
218217

@@ -223,7 +222,7 @@ def read_version(self):
223222
version_match = re.search(r"Open On-Chip Debugger (\d+.\d+.\d+)", out)
224223
version = version_match.group(1).split('.')
225224

226-
return [self.to_num(i) for i in version]
225+
return [to_num(i) for i in version]
227226

228227
def supports_thread_info(self):
229228
# Zephyr rtos was introduced after 0.11.0

0 commit comments

Comments
 (0)