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

Fix incompatibilites between Python 2 and Python 3

This commit is contained in:
Thomas Pointhuber 2018-08-04 17:11:45 +02:00 committed by Maciej Suminski
parent 7548a3b1bf
commit 8805706ccb
8 changed files with 72 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/swig/dlist.i
View File

@ -39,7 +39,10 @@
def __init__(self,aList): def __init__(self,aList):
self.last = aList # last item is the start of list self.last = aList # last item is the start of list
def next(self): # get the next item def next(self): # get the next item, Python 2 way to implement an iterator
return self.__next__()
def __next__(self): # get the next item
item = self.last item = self.last
try: try:

12
common/swig/kiway.i
View File

@ -220,28 +220,28 @@ if os.path.exists(libcef_so):
%{ %{
def OnPgmInit(self): def OnPgmInit(self):
print "hereA" print("hereA")
if not self.InitPgm(): if not self.InitPgm():
return False; return False;
print "hereB" print("hereB")
try: try:
# A KIWAY_PLAYER is a wx.Window # A KIWAY_PLAYER is a wx.Window
frame = Kiway.Player( FRAME_SCH, True ) frame = Kiway.Player( FRAME_SCH, True )
print "here0" print("here0")
except IOError as e: except IOError as e:
print 'Player()', e print('Player()', e)
return None return None
print "here1" print("here1")
Kiway.SetTop(frame) Kiway.SetTop(frame)
print "here2" print("here2")
return frame return frame
%} %}

9
pcbnew/python/examples/createPcb.py
View File

@ -1,4 +1,7 @@
#!/usr/bin/env python2.7 #!/usr/bin/env python
from __future__ import print_function
from pcbnew import * from pcbnew import *
size_0_6mm = wxSizeMM(0.6,0.6) size_0_6mm = wxSizeMM(0.6,0.6)
@ -38,11 +41,11 @@ pcb.Save("my2.kicad_pcb")
pcb = LoadBoard("my2.kicad_pcb") pcb = LoadBoard("my2.kicad_pcb")
print map( lambda x: x.GetReference() , list(pcb.GetModules())) print(map( lambda x: x.GetReference() , list(pcb.GetModules())))
for m in pcb.GetModules(): for m in pcb.GetModules():
for p in m.Pads(): for p in m.Pads():
print 'pad ', p.GetName(), p.GetPosition(), p.GetOffset() print('pad ', p.GetName(), p.GetPosition(), p.GetOffset())
# pcb.GetDesignSettings() # pcb.GetDesignSettings()

2
pcbnew/python/examples/hidePcbValuesShowReferences.py
View File

@ -7,7 +7,7 @@ filename=sys.argv[1]
pcb = LoadBoard(filename) pcb = LoadBoard(filename)
for module in pcb.GetModules(): for module in pcb.GetModules():
print "* Module: %s"%module.GetReference() print("* Module: %s" % module.GetReference())
module.Value().SetVisible(False) # set Value as Hidden module.Value().SetVisible(False) # set Value as Hidden
module.Reference().SetVisible(True) # set Reference as Visible module.Reference().SetVisible(True) # set Reference as Visible

46
pcbnew/python/examples/listPcb.py
View File

@ -1,4 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import sys import sys
from pcbnew import * from pcbnew import *
@ -11,7 +14,7 @@ FromUnits = FromMM
#ToUnits=ToMils #ToUnits=ToMils
#FromUnits=FromMils #FromUnits=FromMils
print "LISTING VIAS:" print("LISTING VIAS:")
for item in pcb.GetTracks(): for item in pcb.GetTracks():
if type(item) is VIA: if type(item) is VIA:
@ -19,7 +22,7 @@ for item in pcb.GetTracks():
pos = item.GetPosition() pos = item.GetPosition()
drill = item.GetDrillValue() drill = item.GetDrillValue()
width = item.GetWidth() width = item.GetWidth()
print " * Via: %s - %f/%f "%(ToUnits(pos),ToUnits(drill),ToUnits(width)) print(" * Via: %s - %f/%f " % (ToUnits(pos), ToUnits(drill), ToUnits(width)))
elif type(item) is TRACK: elif type(item) is TRACK:
@ -27,40 +30,39 @@ for item in pcb.GetTracks():
end = item.GetEnd() end = item.GetEnd()
width = item.GetWidth() width = item.GetWidth()
print " * Track: %s to %s, width %f" % (ToUnits(start),ToUnits(end),ToUnits(width)) print(" * Track: %s to %s, width %f" % (ToUnits(start), ToUnits(end), ToUnits(width)))
else: else:
print "Unknown type %s" % type(item) print("Unknown type %s" % type(item))
print "" print("")
print "LIST DRAWINGS:" print("LIST DRAWINGS:")
for item in pcb.GetDrawings(): for item in pcb.GetDrawings():
if type(item) is TEXTE_PCB: if type(item) is TEXTE_PCB:
print "* Text: '%s' at %s"%(item.GetText(), item.GetPosition()) print("* Text: '%s' at %s" % (item.GetText(), item.GetPosition()))
elif type(item) is DRAWSEGMENT: elif type(item) is DRAWSEGMENT:
print "* Drawing: %s"%item.GetShapeStr() # dir(item) print("* Drawing: %s" % item.GetShapeStr()) # dir(item)
else: else:
print type(item) print(type(item))
print "" print("")
print "LIST MODULES:" print("LIST MODULES:")
for module in pcb.GetModules(): for module in pcb.GetModules():
print "* Module: %s at %s"%(module.GetReference(), ToUnits(module.GetPosition())) print("* Module: %s at %s" % (module.GetReference(), ToUnits(module.GetPosition())))
print "" print("")
print "Nets cnt: ", pcb.GetNetCount() print("Nets cnt: ", pcb.GetNetCount())
print "track w cnt:",len(pcb.GetTrackWidthList()) print("track w cnt:", len(pcb.GetTrackWidthList()))
print "via s cnt:",len(pcb.GetViasDimensionsList()) print("via s cnt:", len(pcb.GetViasDimensionsList()))
print "" print("")
print "LIST ZONES:", pcb.GetAreaCount() print("LIST ZONES:", pcb.GetAreaCount())
for idx in range(0, pcb.GetAreaCount()): for idx in range(0, pcb.GetAreaCount()):
zone=pcb.GetArea(idx) zone=pcb.GetArea(idx)
print "zone:", idx, "priority:", zone.GetPriority(), "netname", zone.GetNetname() print("zone:", idx, "priority:", zone.GetPriority(), "netname", zone.GetNetname())
print ""
print "NetClasses:", pcb.GetNetClasses().GetCount(),
print("")
print("NetClasses:", pcb.GetNetClasses().GetCount())

10
pcbnew/swig/tests/test1.py
View File

@ -1,11 +1,11 @@
from __future__ import print_function
import pcbnew import pcbnew
pcb = pcbnew.GetBoard() pcb = pcbnew.GetBoard()
for m in pcb.GetModules(): for m in pcb.GetModules():
print m.GetPosition() print(m.GetPosition())
for p in m.Pads(): for p in m.Pads():
print "p=>",p.GetPosition(),p.GetName() print("p=>", p.GetPosition(), p.GetName())
print p.GetPosition() print(p.GetPosition())

6
pcbnew/swig/tests/test2.py
View File

@ -1,8 +1,10 @@
from __future__ import print_function
import pcbnew import pcbnew
pcb = pcbnew.GetBoard() pcb = pcbnew.GetBoard()
for m in pcb.GetModules(): for m in pcb.GetModules():
print m.GetReference(),"(",m.GetValue(),") at ", m.GetPosition() print(m.GetReference(), "(", m.GetValue(), ") at ", m.GetPosition())
for p in m.Pads(): for p in m.Pads():
print " pad",p.GetName(), "at",p.GetPosition() print(" pad", p.GetName(), "at", p.GetPosition())

45
qa/testcases/test_001_pcb_load.py
View File

@ -7,42 +7,41 @@ class TestPCBLoad(unittest.TestCase):
def setUp(self): def setUp(self):
self.pcb = pcbnew.LoadBoard("data/complex_hierarchy.kicad_pcb") self.pcb = pcbnew.LoadBoard("data/complex_hierarchy.kicad_pcb")
def test_pcb_load(self): def test_pcb_load(self):
self.assertNotEqual(self.pcb,None) self.assertNotEqual(self.pcb,None)
def test_pcb_track_count(self): def test_pcb_track_count(self):
tracks = list(self.pcb.GetTracks()) tracks = list(self.pcb.GetTracks())
self.assertEqual(len(tracks),361) self.assertEqual(len(tracks),361)
def test_pcb_modules(self): def test_pcb_modules(self):
modules = list(self.pcb.GetModules()) modules = list(self.pcb.GetModules())
self.assertEqual(len(modules), 72) self.assertEqual(len(modules), 72)
def test_pcb_module_references(self): def test_pcb_module_references(self):
board_refs = list(module.GetReference() for board_refs = list(module.GetReference() for
module in self.pcb.GetModules()) module in self.pcb.GetModules())
known_refs = [u'P1', u'P3', u'C2', u'C1', u'D1', u'Q3', u'Q5', u'Q7', known_refs = [u'P1', u'P3', u'C2', u'C1', u'D1', u'Q3', u'Q5', u'Q7',
u'Q6', u'Q1', u'Q2', u'Q4', u'Q8', u'P2', u'U1', u'U4', u'Q6', u'Q1', u'Q2', u'Q4', u'Q8', u'P2', u'U1', u'U4',
u'P4', u'P5', u'P6', u'U3', u'R9', u'R15', u'RV1', u'RV2', u'P4', u'P5', u'P6', u'U3', u'R9', u'R15', u'RV1', u'RV2',
u'C3', u'C4', u'C5', u'C6', u'C7', u'C8', u'C9', u'D2', u'C3', u'C4', u'C5', u'C6', u'C7', u'C8', u'C9', u'D2',
u'D3', u'D4', u'D5', u'D6', u'D7', u'R3', u'R4', u'R5', u'D3', u'D4', u'D5', u'D6', u'D7', u'R3', u'R4', u'R5',
u'R6', u'R7', u'R8', u'R10', u'R11', u'R12', u'R13', u'R6', u'R7', u'R8', u'R10', u'R11', u'R12', u'R13',
u'R14', u'R16', u'R17', u'R18', u'R19', u'R20', u'R21', u'R14', u'R16', u'R17', u'R18', u'R19', u'R20', u'R21',
u'R22', u'MIRE', u'C10', u'C11', u'R22', u'MIRE', u'C10', u'C11',
u'U2', u'C14', u'C12', u'R23', u'R24', u'D9', u'D8', u'R25', u'U2', u'C14', u'C12', u'R23', u'R24', u'D9', u'D8', u'R25',
u'R26', u'R27', u'R28'] u'R26', u'R27', u'R28']
for ref in known_refs:
self.assertTrue(ref in board_refs)
for ref in known_refs:
self.assertTrue(ref in board_refs)
def test_pcb_netcount(self): def test_pcb_netcount(self):
self.assertEqual(self.pcb.GetNetCount(),51) self.assertEqual(self.pcb.GetNetCount(),51)
#def test_interactive(self): #def test_interactive(self):
# code.interact(local=locals()) # code.interact(local=locals())
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()