Fix nightly compatibility and json utf errors

openscopeproject · Feb 28, 2021 · e47db71 · e47db71
1 parent a63e4a0
commit e47db71
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/InteractiveHtmlBom/ecad/__init__.py b/InteractiveHtmlBom/ecad/__init__.py
@@ -9,8 +9,8 @@ def get_parser_by_extension(file_name, config, logger):
         """.json file may be from EasyEDA or a generic json format"""
         import io
         import json
-        with io.open(file_name, 'r') as f:
-            obj = json.load(f)
+        with io.open(file_name, 'r', encoding='utf-8') as f:
+            obj = json.load(f, encoding='utf-8')
         if 'pcbdata' in obj:
             return get_generic_json_parser(file_name, config, logger)
         else:

diff --git a/InteractiveHtmlBom/ecad/genericjson.py b/InteractiveHtmlBom/ecad/genericjson.py
@@ -10,8 +10,8 @@ class GenericJsonParser(EcadParser):
 
     def get_generic_json_pcb(self):
         from os import path
-        with io.open(self.file_name, 'r') as f:
-            pcb = json.load(f)
+        with io.open(self.file_name, 'r', encoding='utf-8') as f:
+            pcb = json.load(f, encoding='utf-8')
 
         if 'spec_version' not in pcb:
             raise ValidationError("'spec_version' is a required property")
@@ -25,8 +25,8 @@ def get_generic_json_pcb(self):
                                      'genericjsonpcbdata_v{}.schema'
                                      .format(pcb['spec_version']))
 
-        with io.open(schema_file_name, 'r') as f:
-            schema = json.load(f)
+        with io.open(schema_file_name, 'r', encoding='utf-8') as f:
+            schema = json.load(f, encoding='utf-8')
 
         validate(instance=pcb, schema=schema)
 

diff --git a/InteractiveHtmlBom/ecad/kicad.py b/InteractiveHtmlBom/ecad/kicad.py
@@ -320,7 +320,7 @@ def parse_pad(self, pad):
     def parse_footprints(self):
         # type: () -> list
         footprints = []
-        for f in self.footprints:
+        for f in self.footprints:  # type: pcbnew.FOOTPRINT
             ref = f.GetReference()
 
             # bounding box
@@ -330,11 +330,14 @@ def parse_footprints(self):
                 f_copy = pcbnew.FOOTPRINT(f)
             f_copy.SetOrientation(0)
             f_copy.SetPosition(pcbnew.wxPoint(0, 0))
-            mrect = f_copy.GetFootprintRect()
+            if hasattr(f_copy, 'GetFootprintRect'):
+                footprint_rect = f_copy.GetFootprintRect()
+            else:
+                footprint_rect = f_copy.GetBoundingBox(False, False)
             bbox = {
                 "pos": self.normalize(f.GetPosition()),
-                "relpos": self.normalize(mrect.GetPosition()),
-                "size": self.normalize(mrect.GetSize()),
+                "relpos": self.normalize(footprint_rect.GetPosition()),
+                "size": self.normalize(footprint_rect.GetSize()),
                 "angle": f.GetOrientation() * 0.1,
             }