Merge pull request #856 from flit/bugfix/name_issues

Fix several issues identified by pytype

Author: flit

pyocd/coresight/discovery.py

@@ -48,7 +48,7 @@ def discover(self):
         """! @brief Init task for component discovery.
         @return CallSequence for the discovery process.
         """
-        raise NotImplementedException()
+        raise NotImplementedError()
 
     def _create_component(self, cmpid):
         LOG.debug("Creating %s component", cmpid.name)

pyocd/coresight/gpr.py

@@ -44,6 +44,7 @@ def factory(cls, ap, cmpid, address):
 
     def __init__(self, ap, cmpid=None, addr=None):
         super(GPR, self).__init__(ap, cmpid, addr)
+        self.domain_count = 0
 
     def init(self):
         """! @brief Inits the GPR."""

pyocd/coresight/itm.py

@@ -97,7 +97,7 @@ def enable(self, enabled_ports=0xffffffff):
         self.ap.write32(self.address + ITM.TPR, 0xf) # Allow unprivileged access to all 32 ports.
         self._is_enabled = True
 
-    def set_enabled_ports(enabled_ports):
+    def set_enabled_ports(self, enabled_ports):
         self.ap.write32(self.address + ITM.TERn, enabled_ports)
 
     def disable(self):

pyocd/flash/eraser.py

@@ -129,6 +129,8 @@ def _sector_erase(self, addresses):
                     flash = region.flash
                     flash.init(flash.Operation.ERASE)
 
+                assert flash is not None
+                
                 # Get sector info for the current address.
                 sector_info = flash.get_sector_info(sector_addr)
                 assert sector_info, ("sector address 0x%08x within flash region '%s' is invalid"

pyocd/flash/file_programmer.py

@@ -82,6 +82,7 @@ def __init__(self, session, progress=None, chip_erase=None, smart_flash=None,
         self._trust_crc = trust_crc
         self._keep_unwritten = keep_unwritten
         self._progress = progress
+        self._loader = None
 
         self._format_handlers = {
             'axf': self._program_elf,

pyocd/flash/flash.py

@@ -75,7 +75,7 @@ def __init__(self):
 
     def __repr__(self):
         return "<FlashInfo@0x%x start=0x%x erswt=%g crc=%s>" \
-            % (id(self), self.rom_start, self._erase_weight, self.crc_supported)
+            % (id(self), self.rom_start, self.erase_weight, self.crc_supported)
 
 class Flash(object):
     """!

pyocd/probe/jlink_probe.py

@@ -17,7 +17,8 @@
 import six
 import logging
 import pylink
-from pylink.errors import JLinkException
+from time import sleep
+from pylink.errors import (JLinkException, JLinkWriteException, JLinkReadException)
 
 from .debug_probe import DebugProbe
 from ..core import (exceptions, memory_interface)
@@ -301,7 +302,7 @@ def read_ap_multiple(self, addr, count=1, now=True):
         results = [self.read_ap(addr, now=True) for n in range(count)]
 
         def read_ap_multiple_result_callback():
-            return result
+            return results
 
         return results if now else read_ap_multiple_result_callback
 

pyocd/probe/pydapaccess/interface/hidapi_backend.py

@@ -43,6 +43,7 @@ def __init__(self):
         super(HidApiUSB, self).__init__()
         # Vendor page and usage_id = 2
         self.device = None
+        self.device_info = None
 
     def open(self):
         try:
@@ -110,18 +111,8 @@ def read(self, timeout=-1):
 #         LOG.debug("rcv<(%d) %s" % (len(data), ' '.join(['%02x' % i for i in data])))
         return data
 
-    def get_serial_number(self):
-        return self.serial_number
-
     def close(self):
         """! @brief Close the interface
         """
         LOG.debug("closing interface")
         self.device.close()
-
-    def set_packet_count(self, count):
-        # No interface level restrictions on count
-        self.packet_count = count
-
-    def set_packet_size(self, size):
-        self.packet_size = size

pyocd/probe/pydapaccess/interface/interface.py

@@ -22,6 +22,7 @@ def __init__(self):
         self.pid = 0
         self.vendor_name = ""
         self.product_name = ""
+        self.serial_number = ""
         self.packet_count = 1
         self.packet_size = 64
 
@@ -32,6 +33,9 @@ def has_swo_ep(self):
     def open(self):
         return
 
+    def close(self):
+        return
+
     def write(self, data):
         return
 
@@ -44,12 +48,15 @@ def get_info(self):
                str(hex(self.vid)) + ", " + \
                str(hex(self.pid)) + ")"
 
-    def set_packet_count(self, count):
-        # Unless overridden the packet count cannot be changed
-        return
-
     def get_packet_count(self):
         return self.packet_count
 
-    def close(self):
-        return
+    def set_packet_count(self, count):
+        # No interface level restrictions on count
+        self.packet_count = count
+
+    def set_packet_size(self, size):
+        self.packet_size = size
+
+    def get_serial_number(self):
+        return self.serial_number

pyocd/probe/pydapaccess/interface/pyusb_backend.py

@@ -193,16 +193,6 @@ def read(self):
                                             self.serial_number)
         return self.rcv_data.pop(0)
 
-    def set_packet_count(self, count):
-        # No interface level restrictions on count
-        self.packet_count = count
-
-    def set_packet_size(self, size):
-        self.packet_size = size
-
-    def get_serial_number(self):
-        return self.serial_number
-
     def close(self):
         """! @brief Close the interface
         """