From d29edf6381f8f88f401405dcef9342092163a106 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Wed, 12 Aug 2020 06:21:06 -0700 Subject: [PATCH] Removing extra parameters to super() calls The extra parameters seem to cause problems for some Python configurations and are not needed. Fixes https://gitlab.com/kicad/code/kicad/issues/4896 (cherry picked from commit d8d8f4f67037469f06ba70de9fe051526fa9715c) --- pcbnew/python/plugins/PadArray.py | 10 +++++----- pcbnew/python/plugins/microMatch_connectors.py | 2 +- pcbnew/python/plugins/sdip_wizard.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pcbnew/python/plugins/PadArray.py b/pcbnew/python/plugins/PadArray.py index 5e1bdc7e49..19b8cbd870 100644 --- a/pcbnew/python/plugins/PadArray.py +++ b/pcbnew/python/plugins/PadArray.py @@ -302,7 +302,7 @@ class PadZGridArray(PadArray): @param pad_pitch: distance between pads in a line @param centre: array centre point """ - super(PadZGridArray, self).__init__(pad) + super().__init__(pad) self.pad_count = int(pad_count) self.line_count = int(line_count) @@ -360,9 +360,9 @@ class PadLineArray(PadGridArray): """ if isVertical: - super(PadLineArray, self).__init__(pad, 1, n, 0, pitch, centre) + super().__init__(pad, 1, n, 0, pitch, centre) else: - super(PadLineArray, self).__init__(pad, n, 1, pitch, 0, centre) + super().__init__(pad, n, 1, pitch, 0, centre) class PadCircleArray(PadArray): @@ -383,7 +383,7 @@ class PadCircleArray(PadArray): @param padRotationOffset: rotation of first pad """ - super(PadCircleArray, self).__init__(pad) + super().__init__(pad) self.n = int(n) self.r = r @@ -434,7 +434,7 @@ class PadCustomArray(PadArray): @param pad: the prototypical pad @param array: the position data array """ - super(PadCustomArray, self).__init__(pad) + super().__init__(pad) self.array = array diff --git a/pcbnew/python/plugins/microMatch_connectors.py b/pcbnew/python/plugins/microMatch_connectors.py index 8a66b996b5..c168132daf 100644 --- a/pcbnew/python/plugins/microMatch_connectors.py +++ b/pcbnew/python/plugins/microMatch_connectors.py @@ -42,7 +42,7 @@ class PadStaggeredZGridArray(PA.PadArray): @param aCentre Center position """ - super(PadStaggeredZGridArray, self).__init__(aPad) + super().__init__(aPad) self.padCount = int(aPadCount) self.lineCount = int(aLineCount) diff --git a/pcbnew/python/plugins/sdip_wizard.py b/pcbnew/python/plugins/sdip_wizard.py index c636c772b7..79e80de0c6 100644 --- a/pcbnew/python/plugins/sdip_wizard.py +++ b/pcbnew/python/plugins/sdip_wizard.py @@ -24,7 +24,7 @@ import PadArray as PA class RowedGridArray(PA.PadGridArray): def __init__(self, *args, **kwargs): - super(RowedGridArray, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def NamingFunction(self, x, y): pad_cnt = self.nx*self.ny