haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverts premature Python 3 calls in favor of backwards compat. 

This reverts commits d8d8f4f670
and 9614f6d0d9.

(cherry picked from commit 91914f1a71)
This commit is contained in:
Seth Hillbrand 2020-09-03 19:57:04 -07:00
parent 49cc47afd1
commit 1fdb247167
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/python/plugins/PadArray.py
View File

@ -212,7 +212,7 @@ class PadGridArray(PadArray):
@param py: pitch in y-direction @param py: pitch in y-direction
@param centre: array centre point @param centre: array centre point
""" """
super().__init__(pad) super(PadGridArray, self).__init__(pad)
self.nx = int(nx) self.nx = int(nx)
self.ny = int(ny) self.ny = int(ny)
@ -302,7 +302,7 @@ class PadZGridArray(PadArray):
@param pad_pitch: distance between pads in a line @param pad_pitch: distance between pads in a line
@param centre: array centre point @param centre: array centre point
""" """
super().__init__(pad) super(PadZGridArray, self).__init__(pad)
self.pad_count = int(pad_count) self.pad_count = int(pad_count)
self.line_count = int(line_count) self.line_count = int(line_count)
@ -360,9 +360,9 @@ class PadLineArray(PadGridArray):
""" """
if isVertical: if isVertical:
super().__init__(pad, 1, n, 0, pitch, centre) super(PadLineArray, self).__init__(pad, 1, n, 0, pitch, centre)
else: else:
super().__init__(pad, n, 1, pitch, 0, centre) super(PadLineArray, self).__init__(pad, n, 1, pitch, 0, centre)
class PadCircleArray(PadArray): class PadCircleArray(PadArray):
@ -383,7 +383,7 @@ class PadCircleArray(PadArray):
@param padRotationOffset: rotation of first pad @param padRotationOffset: rotation of first pad
""" """
super().__init__(pad) super(PadCircleArray, self).__init__(pad)
self.n = int(n) self.n = int(n)
self.r = r self.r = r
@ -434,7 +434,7 @@ class PadCustomArray(PadArray):
@param pad: the prototypical pad @param pad: the prototypical pad
@param array: the position data array @param array: the position data array
""" """
super().__init__(pad) super(PadCustomArray, self).__init__(pad)
self.array = array self.array = array

2
pcbnew/python/plugins/microMatch_connectors.py
View File

@ -42,7 +42,7 @@ class PadStaggeredZGridArray(PA.PadArray):
@param aCentre Center position @param aCentre Center position
""" """
super().__init__(aPad) super(PadStaggeredZGridArray, self).__init__(aPad)
self.padCount = int(aPadCount) self.padCount = int(aPadCount)
self.lineCount = int(aLineCount) self.lineCount = int(aLineCount)

2
pcbnew/python/plugins/sdip_wizard.py
View File

@ -24,7 +24,7 @@ import PadArray as PA
class RowedGridArray(PA.PadGridArray): class RowedGridArray(PA.PadGridArray):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super(RowedGridArray, self).__init__(*args, **kwargs)
def NamingFunction(self, x, y): def NamingFunction(self, x, y):
pad_cnt = self.nx*self.ny pad_cnt = self.nx*self.ny