commit c531e4c2ac34a9eca268efb78834cf5245d745d0
author Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Mon Mar 18 14:16:40 2024 +0100
committer Carles Cufí <carles.cufi@nordicsemi.no> Wed Mar 20 09:59:27 2024 +0100
tree bf12a88c7c7f2ab00cd4f282f4463b353db99764
parent c82b38c7be850a6451ef3f897b81241305d302dd

scripts: test for imported ELFFile instead of setting it to None

mypy fails with:
Incompatible types in assignment
        (expression has type "None", variable has type "Type[ELFFile]")

this happens because of the code:
    try:
        from elftools.elf.elffile import ELFFile
    except ImportError:
        ELFFile = None

ELFFile is set to None to allow later code to check if ELFFile was
imported by checking against None. Instead of setting ELFFile to None,
then update testing code to check if the class has been loaded, as:
    if globals().get('ELFFile') is None:

Update the try-catch to `pass`.

Removed ELFFile cargo cult from intel_cyclonev.py and fix pylint
warnings.

Disable duplicate code check. The intel_cyclonev.py is already based
upon openocd.py, so although the duplication detection is correct then
this should not prevent other code changes / fixes to those files from
being applied.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>

scripts/west_commands/runners/intel_cyclonev.py

diff --git a/scripts/west_commands/runners/intel_cyclonev.py b/scripts/west_commands/runners/intel_cyclonev.py
index eb67c86..c6bfb65 100644
--- a/scripts/west_commands/runners/intel_cyclonev.py
+++ b/scripts/west_commands/runners/intel_cyclonev.py
@@ -11,11 +11,6 @@
 from os import path
 from pathlib import Path
 
-try:
-    from elftools.elf.elffile import ELFFile
-except ImportError:
-    ELFFile = None
-
 from runners.core import ZephyrBinaryRunner, RunnerCaps
 
 DEFAULT_OPENOCD_TCL_PORT = 6333
@@ -195,7 +190,7 @@
     def read_version(self):
         self.require(self.openocd_cmd[0])
 
-	# OpenOCD prints in stderr, need redirect to get output
+        # OpenOCD prints in stderr, need redirect to get output
         out = self.check_output([self.openocd_cmd[0], '--version'],
                                 stderr=subprocess.STDOUT).decode()
 
@@ -210,9 +205,6 @@
 
     def do_run(self, command, **kwargs):
         self.require(self.openocd_cmd[0])
-        if ELFFile is None:
-            raise RuntimeError(
-                'elftools missing; please "pip3 install elftools"')
 
         self.cfg_cmd = []
         if self.openocd_config is not None:
@@ -272,11 +264,11 @@
         self.require(gdb_cmd[0])
         self.print_gdbserver_message()
 
-        cmd1 = (echo + server_cmd)
+        cmd1 = echo + server_cmd
         self.check_call(cmd1)
-        cmd2 = (echo + gdb_cmd)
+        cmd2 = echo + gdb_cmd
         self.check_call(cmd2)
-        cmd3 = (echo + gdb_cmd2)
+        cmd3 = echo + gdb_cmd2
         self.check_call(cmd3)
 
         self.run_server_and_client(server_cmd, gdb_cmd)

scripts/west_commands/runners/openocd.py

diff --git a/scripts/west_commands/runners/openocd.py b/scripts/west_commands/runners/openocd.py
index ff92d4f..dd7c688 100644
--- a/scripts/west_commands/runners/openocd.py
+++ b/scripts/west_commands/runners/openocd.py
@@ -1,6 +1,8 @@
 # Copyright (c) 2017 Linaro Limited.
 #
 # SPDX-License-Identifier: Apache-2.0
+#
+# pylint: disable=duplicate-code
 
 '''Runner for openocd.'''
 
@@ -13,7 +15,7 @@
 try:
     from elftools.elf.elffile import ELFFile
 except ImportError:
-    ELFFile = None
+    pass
 
 from runners.core import ZephyrBinaryRunner
 
@@ -189,7 +191,7 @@
     def read_version(self):
         self.require(self.openocd_cmd[0])
 
-	# OpenOCD prints in stderr, need redirect to get output
+        # OpenOCD prints in stderr, need redirect to get output
         out = self.check_output([self.openocd_cmd[0], '--version'],
                                 stderr=subprocess.STDOUT).decode()
 
@@ -204,7 +206,7 @@
 
     def do_run(self, command, **kwargs):
         self.require(self.openocd_cmd[0])
-        if ELFFile is None:
+        if globals().get('ELFFile') is None:
             raise RuntimeError(
                 'elftools missing; please "pip3 install elftools"')