- converted from Python2 code to Python3 code

- in camlib.py, CNCJob class -> generate_from_excellon_by_tool() was
failing in the line to sort the tools due of been unable to compare
between dict's. I replaced that section.
This commit is contained in:
Marius Stanciu
2018-05-26 04:43:40 +03:00
parent bb3b07455c
commit a4bbb98bf1
76 changed files with 394 additions and 389 deletions

View File

@@ -1,34 +1,34 @@
#import sys
import platform
print "Platform", platform.system(), platform.release()
print "Distro", platform.dist()
print "Python", platform.python_version()
print(("Platform", platform.system(), platform.release()))
print(("Distro", platform.dist()))
print(("Python", platform.python_version()))
import rtree
print "rtree", rtree.__version__
print(("rtree", rtree.__version__))
import shapely
import shapely.geos
print "shapely", shapely.__version__
print "GEOS library", shapely.geos.geos_version
print(("shapely", shapely.__version__))
print(("GEOS library", shapely.geos.geos_version))
from PyQt4 import Qt
print "Qt", Qt.qVersion()
print(("Qt", Qt.qVersion()))
import numpy
print "Numpy", numpy.__version__
print(("Numpy", numpy.__version__))
import matplotlib
print "MatPlotLib", matplotlib.__version__
print "MPL Numpy", matplotlib.__version__numpy__
print(("MatPlotLib", matplotlib.__version__))
print(("MPL Numpy", matplotlib.__version__numpy__))

View File

@@ -19,10 +19,10 @@ def gerber_find(filename, coords, frac_digits=5, tol=0.1):
current_y = parse_gerber_number(match.group(3), frac_digits)
if distance(coords, (current_x, current_y)) <= tol:
print line_num, ":", line.strip('\n\r')
print((line_num, ":", line.strip('\n\r')))
except Exception as e:
print str(e)
print line_num, ":", line.strip('\n\r')
print((str(e)))
print((line_num, ":", line.strip('\n\r')))
if __name__ == "__main__":