Numerous fixes for issues identified by LGTM.

- Fix for loop in TraceEventFilter.
- Unused variable definitions.
- Unreachable statements.
- __eq__() not redefined when attributes were added to a subclass.
- Unnecessary use of else branch on loop.
- Raising NotImplemented instead of NotImplementedError.
- Removed redefined GDBServer.restart().
- Duplicate dict keys.
- Catchall exception handlers.

Author: flit

pyocd/commands/commands.py

@@ -1028,7 +1028,6 @@ def parse(self, args):
 
     def execute(self):
         try:
-            type = self.context.selected_core.get_breakpoint_type(self.addr)
             self.context.selected_core.remove_breakpoint(self.addr)
             self.context.selected_core.bp_manager.flush()
             self.context.writei("Removed breakpoint at 0x%08x", self.addr)
@@ -1158,7 +1157,6 @@ def execute(self):
         if self.show_core:
             self.context.writei("Core %d is selected", self.context.selected_core.core_number)
             return
-        original_core_ap = core_ap = self.context.selected_core.ap
         self.context.selected_core = self.context.session.target.cores[self.core_num]
         core_ap = self.context.selected_core.ap
         self.context.selected_ap_address = core_ap.address
@@ -1625,7 +1623,6 @@ def print_disasm(context, code, start_addr, max_instructions=None):
         pc = -1
     md = capstone.Cs(capstone.CS_ARCH_ARM, capstone.CS_MODE_THUMB)
 
-    addrLine = 0
     text = ''
     n = 0
     for i in md.disasm(code, start_addr):

pyocd/commands/execution_context.py

@@ -354,7 +354,6 @@ def parse_command(self, cmdline):
                         ", ".join("'%s'" % c for c in all_matches)))
             else:
                 raise exceptions.CommandError("unrecognized command '%s'" % cmd)
-            return
 
         return CommandInvocation(matched_command, args, self.execute_command)
 

pyocd/commands/values.py

@@ -531,11 +531,9 @@ def display(self, args):
     def modify(self, args):
         if len(args) < 1:
             raise exceptions.CommandError("no log level provided")
-            return 1
         level_name = args[0].lower()
         if level_name not in self.LEVELS:
             raise exceptions.CommandError("log level must be one of {%s}" % ','.join(self.LEVELS.keys()))
-            return 1
         level = self.LEVELS[level_name]
         if len(args) == 1:
             logging.getLogger().setLevel(level)
@@ -571,12 +569,10 @@ def display(self, args):
     def modify(self, args):
         if len(args) < 1:
             raise exceptions.CommandError("no clock frequency provided")
-            return 1
         try:
             freq_Hz = convert_frequency(args[0])
         except:
             raise exceptions.CommandError("invalid frequency")
-            return 1
         self.context.probe.set_clock(freq_Hz)
         if self.context.probe.wire_protocol == DebugProbe.Protocol.SWD:
             swd_jtag = 'SWD'

pyocd/core/memory_map.py

@@ -249,9 +249,8 @@ def __copy__(self):
                 **self._attributes
                 )
 
-    def __hash__(self):
-        # Need to redefine __hash__ since we redefine __eq__.
-        return super(MemoryRegion, self).__hash__()
+    # Need to redefine __hash__ since we redefine __eq__.
+    __hash__ = MemoryRangeBase.__hash__
 
     def __eq__(self, other):
         # Include type and attributes in equality comparison.
@@ -411,6 +410,14 @@ def __copy__(self):
         clone._flm = self._flm
         return clone
 
+    # Need to redefine __hash__ since we redefine __eq__.
+    __hash__ = MemoryRegion.__hash__
+    
+    def __eq__(self, other):
+        # Include flash algo, class, and flm in equality test.
+        return super(FlashRegion, self).__eq__(other) and self.algo == other.algo and \
+                self.flash_class == other.flash_class and self.flm == other.flm
+
     def __repr__(self):
         return "<%s@0x%x name=%s type=%s start=0x%x end=0x%x length=0x%x access=%s blocksize=0x%x>" % (self.__class__.__name__, id(self), self.name, self.type, self.start, self.end, self.length, self.access, self.blocksize)
 

pyocd/core/options_manager.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2019 Arm Limited
+# Copyright (c) 2019-2020 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -116,8 +116,7 @@ def is_set(self, key):
         for layer in self._layers:
             if key in layer:
                 return True
-        else:
-            return False
+        return False
 
     def get_default(self, key):
         """! @brief Return the default value for the specified option."""

pyocd/coresight/ap.py

@@ -197,7 +197,7 @@ def __init__(self, address):
     @property
     def ap_version(self):
         """! @brief Version of the AP, as an APVersion enum."""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @property
     def nominal_address(self):
@@ -212,12 +212,12 @@ def address(self):
         
         This value can be passed to the DebugPort's read_ap() or write_ap() methods. Offsets of
         registers can be added to this value to create register addresses."""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     @property
     def idr_address(self):
         """! @brief Address of the IDR register."""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def __hash__(self):
         return hash(self.nominal_address)

pyocd/coresight/gpr.py

@@ -1,5 +1,5 @@
 # pyOCD debugger
-# Copyright (c) 2018 Arm Limited
+# Copyright (c) 2018,2020 Arm Limited
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,8 +66,7 @@ def _power_up(self, mask):
                 value = self.ap.read32(self.address + self.CPWRUPACK)
                 if (value & mask) == mask:
                     return True
-            else:
-                return False
+            return False
 
     def power_up_all(self):
         """! @brief Enable power to all available power domains.

pyocd/debug/elf/elf.py

@@ -79,6 +79,10 @@ def flags_description(self):
         if flagsDesc[-1] == '|':
             flagsDesc = flagsDesc[:-1]
         return flagsDesc
+    
+    def __eq__(self, other):
+        # Include section name in equality test.
+        return super(ELFSection, self).__eq__(other) and self.name == other.name
 
     def __repr__(self):
         return "<ELFSection@0x{0:x} {1} {2} {3} {4} {5}>".format(

pyocd/gdbserver/gdbserver.py

@@ -277,10 +277,6 @@ def _init_remote_commands(self):
         # Add the gdbserver command group.
         self._command_context.command_set.add_command_group('gdbserver')
 
-    def restart(self):
-        if self.is_alive():
-            self.detach_event.set()
-
     def stop(self):
         if self.is_alive():
             self.shutdown_event.set()

pyocd/probe/aggregator.py

@@ -78,8 +78,7 @@ def get_probe_with_id(cls, unique_id):
             probe = cls.get_probe_with_id(unique_id, is_explicit)
             if probe is not None:
                 return probe
-        else:
-            return None
+        return None
 
 # Load plugins when this module is loaded.
 load_plugin_classes_of_type('pyocd.probe', PROBE_CLASSES, DebugProbe)