Eagle parser: formatting and lint fixes

Author: qu1ck

InteractiveHtmlBom/ecad/fusion_eagle.py

@@ -318,10 +318,10 @@ def _calculate_footprint_bbox(self, package, x, y, angle, mirrored):
             sx, sy = 0, 0
 
         return {
-             'pos': [x + dx, -y - dy],
-             'angle': _angle,
-             'relpos': [0, 0],
-             'size': [sx, sy]
+            'pos': [x + dx, -y - dy],
+            'angle': _angle,
+            'relpos': [0, 0],
+            'size': [sx, sy]
         }
 
     def _footprint_pads(self, package, x, y, angle, mirrored, refdes):
@@ -405,11 +405,11 @@ def _footprint_pads(self, package, x, y, angle, mirrored, refdes):
 
             elif el.tag == 'smd':
                 layer = el.attrib['layer']
-                if layer == '1' and not mirrored or \
-                    layer == '16' and mirrored:
+                if layer == self.TOP_COPPER_LAYER and not mirrored or \
+                        layer == self.BOT_COPPER_LAYER and mirrored:
                     layers = ['F']
-                elif layer == '1' and mirrored or \
-                    layer == '16' and not mirrored:
+                elif layer == self.TOP_COPPER_LAYER and mirrored or \
+                        layer == self.BOT_COPPER_LAYER and not mirrored:
                     layers = ['B']
                 else:
                     self.logger.error('Unable to determine layer for '
@@ -449,7 +449,7 @@ def _footprint_pads(self, package, x, y, angle, mirrored, refdes):
                     else:
                         pad['shape'] = 'roundrect'
                         pad['radius'] = (float(el.attrib['roundness']) / 100) \
-                                        * float(el.attrib['dy']) / 2
+                            * float(el.attrib['dy']) / 2
 
                     if self.config.include_nets and \
                             element_pad_nets is not None:
@@ -525,9 +525,10 @@ def _process_footprint(self, package, x, y, angle, mirrored, populate):
                 elif el.tag == 'rectangle':
                     _dv = self._rectangle_vertices(el)
 
-                    # Rotate rectangle about component origin based on component angle
-                    dv = [self._rotate(_x, _y, -angle, mirrored) for (_x, _y) in
-                          _dv]
+                    # Rotate rectangle about component origin based on
+                    # component angle
+                    dv = [self._rotate(_x, _y, -angle, mirrored)
+                          for (_x, _y) in _dv]
 
                     # Map vertices back to absolute coordinates
                     v = [(x + _x, -y + _y) for (_x, _y) in dv]
@@ -581,8 +582,9 @@ def _process_footprint(self, package, x, y, angle, mirrored, populate):
                     else:
                         bot = not top
 
-                        # Note that in Eagle terminology, 'mirrored' essentially means
-                        # 'flipped' (i.e. to the opposite side of the board)
+                        # Note that in Eagle terminology, 'mirrored'
+                        # essentially means 'flipped' (i.e. to the opposite
+                        # side of the board)
                         if (mirrored and bot) or (not mirrored and top):
                             dwg_layer['F'].append(dwg)
                         elif (mirrored and top) or (not mirrored and bot):
@@ -645,26 +647,27 @@ def _element_refdes_to_silk(self, el, package):
                     tr = self.Rot(p_el.get('rot'))
                     tr.angle += elr.angle
                     tr.mirrored ^= elr.mirrored
-                    self._name_to_silk(name=el.attrib['name'],
-                                       x=elx+dx,
-                                       y=ely-dy,
-                                       elr=elr,
-                                       tr=tr,
-                                       align=p_el.get('align'),
-                                       size=float(p_el.attrib['size']),
-                                       ratio=float(p_el.get('ratio', '8'))/100)
-
+                    self._name_to_silk(
+                        name=el.attrib['name'],
+                        x=elx + dx,
+                        y=ely - dy,
+                        elr=elr,
+                        tr=tr,
+                        align=p_el.get('align'),
+                        size=float(p_el.attrib['size']),
+                        ratio=float(p_el.get('ratio', '8')) / 100)
 
         for attr in el.iter('attribute'):
             if attr.attrib['name'] == 'NAME':
-                self._name_to_silk(name=el.attrib['name'],
-                                   x=float(attr.attrib['x']),
-                                   y=-float(attr.attrib['y']),
-                                   elr=self.Rot(el.get('rot')),
-                                   tr=self.Rot(attr.get('rot')),
-                                   align=attr.attrib.get('align'),
-                                   size=float(attr.attrib['size']),
-                                   ratio=float(attr.get('ratio', '8')) / 100)
+                self._name_to_silk(
+                    name=el.attrib['name'],
+                    x=float(attr.attrib['x']),
+                    y=-float(attr.attrib['y']),
+                    elr=self.Rot(el.get('rot')),
+                    tr=self.Rot(attr.get('rot')),
+                    align=attr.attrib.get('align'),
+                    size=float(attr.attrib['size']),
+                    ratio=float(attr.get('ratio', '8')) / 100)
 
     @staticmethod
     def _segments_to_polygon(segs, angle=0, mirrored=False):
@@ -719,13 +722,13 @@ def _parse(self, brdfile):
         try:
             brdxml = ElementTree.parse(brdfile)
         except ElementTree.ParseError as err:
-            self.logger.error("Exception occurred trying to parse {0}, message:"
-                              " {1}"
-                              .format(brdfile.name, err.msg))
+            self.logger.error(
+                "Exception occurred trying to parse {0}, message: {1}"
+                .format(brdfile.name, err.msg))
             return None, None
         if brdxml is None:
-            self.logger.error("No data was able to be parsed from {0}"
-                              .format(brdfile.name))
+            self.logger.error(
+                "No data was able to be parsed from {0}".format(brdfile.name))
             return None, None
 
         # Pick out key sections
@@ -747,8 +750,8 @@ def _parse(self, brdfile):
             self.min_via_w = 0
         else:
             if len(mv) > 1:
-                self.logger.warning("Multiple rlMinViaOuter found, using first "
-                                    "occurrence")
+                self.logger.warning(
+                    "Multiple rlMinViaOuter found, using first occurrence")
             mv = mv[0]
             mv_val = float(''.join(d for d in mv if d in string.digits + '.'))
             mv_units = (''.join(d for d in mv if d in string.ascii_lowercase))
@@ -802,7 +805,7 @@ def _parse(self, brdfile):
 
             # For component, get footprint data
             libs = [lib for lib in board.find('libraries').findall('library')
-                       if lib.attrib['name'] == el.attrib['library']]
+                    if lib.attrib['name'] == el.attrib['library']]
             packages = []
             for lib in libs:
                 p = [pac for pac in lib.find('packages').findall('package')