Merge pull request #721 from flit/bugfix/usb_unicode_err

Catching more USB related exceptions
pyocd · Sep 4, 2019 · e9a0d7c · e9a0d7c
2 parents 4bcb912 + ee8a49f
commit e9a0d7c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,3 @@
-include pytest.ini
-include Doxyfile
 include dev-requirements.txt
 include pyocd/debug/svd/*.zip
 recursive-include docs *

diff --git a/pyocd/probe/pydapaccess/interface/pyusb_backend.py b/pyocd/probe/pydapaccess/interface/pyusb_backend.py
@@ -279,7 +279,7 @@ def __call__(self, dev):
                 LOG.debug("Error accessing USB device (VID=%04x PID=%04x): %s",
                     dev.idVendor, dev.idProduct, error)
             return False
-        except (IndexError, NotImplementedError) as error:
+        except (IndexError, NotImplementedError, ValueError, UnicodeDecodeError) as error:
             LOG.debug("Error accessing USB device (VID=%04x PID=%04x): %s", dev.idVendor, dev.idProduct, error)
             return False
 

diff --git a/pyocd/probe/pydapaccess/interface/pyusb_v2_backend.py b/pyocd/probe/pydapaccess/interface/pyusb_v2_backend.py
@@ -343,7 +343,7 @@ def __call__(self, dev):
                 else:
                     LOG.debug(msg)
             return False
-        except (IndexError, NotImplementedError, ValueError) as error:
+        except (IndexError, NotImplementedError, ValueError, UnicodeDecodeError) as error:
             return False
 
         if cmsis_dap_interface is None: