scripts: west: clean up intel_s1000 runner

Make the flake8 linter happy, spell the board name with the correct
case in the module docstring, and keep the usual camel case naming
convention used for classes.

Signed-off-by: Marti Bolivar <[email protected]>

Author: Marti Bolivar

scripts/meta/west/runner/intel_s1000.py

@@ -2,23 +2,24 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-'''Runner for debugging and flashing Intel_s1000 devices'''
+'''Runner for debugging and flashing intel_s1000 devices'''
 from os import path
 from .core import ZephyrBinaryRunner
 import time
 import signal
 
 DEFAULT_XT_GDB_PORT = 20000
 
-class intel_s1000BinaryRunner(ZephyrBinaryRunner):
+
+class IntelS1000BinaryRunner(ZephyrBinaryRunner):
     '''Runner front-end for Intel_s1000.'''
 
     def __init__(self,
                  board_dir, xt_ocd_dir,
                  ocd_topology, ocd_jtag_instr, gdb_flash_file,
                  elf_name, gdb,
                  gdb_port=DEFAULT_XT_GDB_PORT, debug=False):
-        super(intel_s1000BinaryRunner, self).__init__(debug=debug)
+        super(IntelS1000BinaryRunner, self).__init__(debug=debug)
         self.board_dir = board_dir
         self.xt_ocd_dir = xt_ocd_dir
         self.ocd_topology = ocd_topology
@@ -37,29 +38,37 @@ def do_add_parser(cls, parser):
         # Required
 
         # Optional
-        parser.add_argument('--gdb-port', default=DEFAULT_XT_GDB_PORT,
-                            help='xt-gdb port, defaults to 20000')
-        parser.add_argument('--xt-ocd-dir', default='/opt/Tensilica/xocd-12.0.4/xt-ocd',
-                            help='ocd-dir, defaults to /opt/Tensilica/xocd-12.0.4/xt-ocd')
-        parser.add_argument('--ocd-topology', default='topology_dsp0_flyswatter2.xml',
-                            help='ocd-topology, defaults to topology_dsp0_flyswatter2.xml')
-        parser.add_argument('--ocd-jtag-instr', default='dsp0_gdb.txt',
-                            help='ocd-jtag-instr, defaults to dsp0_gdb.txt')
-        parser.add_argument('--gdb-flash-file', default='load_elf.txt',
-                            help='gdb-flash-file, defaults to load_elf.txt')
+        parser.add_argument(
+            '--gdb-port', default=DEFAULT_XT_GDB_PORT,
+            help='xt-gdb port, defaults to 20000')
+        parser.add_argument(
+            '--xt-ocd-dir', default='/opt/Tensilica/xocd-12.0.4/xt-ocd',
+            help='ocd-dir, defaults to /opt/Tensilica/xocd-12.0.4/xt-ocd')
+        parser.add_argument(
+            '--ocd-topology', default='topology_dsp0_flyswatter2.xml',
+            help='ocd-topology, defaults to topology_dsp0_flyswatter2.xml')
+        parser.add_argument(
+            '--ocd-jtag-instr', default='dsp0_gdb.txt',
+            help='ocd-jtag-instr, defaults to dsp0_gdb.txt')
+        parser.add_argument(
+            '--gdb-flash-file', default='load_elf.txt',
+            help='gdb-flash-file, defaults to load_elf.txt')
 
     @classmethod
     def create_from_args(command, args):
-        return intel_s1000BinaryRunner(
+        return IntelS1000BinaryRunner(
             args.board_dir, args.xt_ocd_dir,
             args.ocd_topology, args.ocd_jtag_instr, args.gdb_flash_file,
             args.kernel_elf, args.gdb,
             gdb_port=args.gdb_port, debug=args.verbose)
 
     def do_run(self, command, **kwargs):
-        kwargs['ocd-topology'] =  path.join(self.board_dir, 'support',  self.ocd_topology)
-        kwargs['ocd-jtag-instr'] = path.join(self.board_dir, 'support', self.ocd_jtag_instr)
-        kwargs['gdb-flash-file'] = path.join(self.board_dir, 'support', self.gdb_flash_file)
+        kwargs['ocd-topology'] = path.join(self.board_dir, 'support',
+                                           self.ocd_topology)
+        kwargs['ocd-jtag-instr'] = path.join(self.board_dir, 'support',
+                                             self.ocd_jtag_instr)
+        kwargs['gdb-flash-file'] = path.join(self.board_dir, 'support',
+                                             self.gdb_flash_file)
 
         if command == 'flash':
             self.flash(**kwargs)
@@ -75,8 +84,8 @@ def flash(self, **kwargs):
 
         self.print_gdbserver_message(self.gdb_port)
         server_cmd = [self.xt_ocd_dir,
-                        '-c', topology_file,
-                        '-I', jtag_instr_file]
+                      '-c', topology_file,
+                      '-I', jtag_instr_file]
 
         # Start the server
         # Note that XTOCD always fails the first time. It has to be
@@ -107,8 +116,8 @@ def do_debug(self):
             raise ValueError('Cannot debug; no gdb specified')
 
         gdb_cmd = [self.gdb_cmd,
-                    '-ex', 'target remote :{}'.format(self.gdb_port),
-                    self.elf_name]
+                   '-ex', 'target remote :{}'.format(self.gdb_port),
+                   self.elf_name]
 
         # The below statement will consume the "^C" keypress ensuring
         # the python main application doesn't exit. This is important
@@ -128,8 +137,8 @@ def debugserver(self, **kwargs):
 
         self.print_gdbserver_message(self.gdb_port)
         server_cmd = [self.xt_ocd_dir,
-                        '-c', topology_file,
-                        '-I', jtag_instr_file]
+                      '-c', topology_file,
+                      '-I', jtag_instr_file]
 
         # Note that XTOCD always fails the first time. It has to be
         # relaunched the second time to work.