SVD: catch KeyError to show warning if builtin SVD was not in svd_data.zip.

Author: flit

pyocd/debug/svd/loader.py

@@ -20,7 +20,10 @@
 import zipfile
 
 from .parser import SVDParser
-from ...utility.compatibility import FileNotFoundError
+from ...utility.compatibility import (
+    FileNotFoundError,
+    BadZipFile,
+    )
 
 LOG = logging.getLogger(__name__)
 
@@ -34,7 +37,7 @@ def from_builtin(cls, svd_name):
             zip_stream = pkg_resources.resource_stream("pyocd", BUILTIN_SVD_DATA_PATH)
             zip = zipfile.ZipFile(zip_stream, 'r')
             return SVDFile(zip.open(svd_name))
-        except (FileNotFoundError, BadZipFile) as err:
+        except (KeyError, FileNotFoundError, BadZipFile) as err:
             from ...core.session import Session
             LOG.warning("unable to open builtin SVD file: %s", err, exc_info=Session.get_current().log_tracebacks)
             return None

pyocd/target/pack/cmsis_pack.py

@@ -25,17 +25,12 @@
 import six
 import struct
 
-# zipfile from Python 2 has a misspelled BadZipFile exception class.
-try:
-    from zipfile import BadZipFile
-except ImportError:
-    from zipfile import BadZipfile as BadZipFile
-
 from .flash_algo import PackFlashAlgo
 from ... import core
 from ...core import exceptions
 from ...core.target import Target
 from ...core.memory_map import (MemoryMap, MemoryType, MEMORY_TYPE_CLASS_MAP, FlashRegion)
+from ...utility.compatibility import BadZipFile
 
 LOG = logging.getLogger(__name__)
 

pyocd/utility/compatibility.py

@@ -66,6 +66,12 @@ def to_str_safe(v):
 except NameError:
     FileNotFoundError = OSError
 
+# zipfile from Python 2 has a misspelled BadZipFile exception class.
+try:
+    from zipfile import BadZipFile
+except ImportError:
+    from zipfile import BadZipfile as BadZipFile
+
 try:
     from shutil import get_terminal_size
 except ImportError: