From: daid303 Date: Fri, 7 Dec 2012 11:20:42 +0000 (+0100) Subject: Fix all the imports in skeinforge. X-Git-Tag: 13.03~167 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1a1a35e4831295f97c877e09f60f14d608bf1640;p=cura.git Fix all the imports in skeinforge. --- diff --git a/Cura/cura_sf/fabmetheus_utilities/archive.py b/Cura/cura_sf/fabmetheus_utilities/archive.py index 767dfd06..5ec89716 100644 --- a/Cura/cura_sf/fabmetheus_utilities/archive.py +++ b/Cura/cura_sf/fabmetheus_utilities/archive.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ import os import sys diff --git a/Cura/cura_sf/fabmetheus_utilities/euclidean.py b/Cura/cura_sf/fabmetheus_utilities/euclidean.py index a8efd49b..f8c17ae8 100644 --- a/Cura/cura_sf/fabmetheus_utilities/euclidean.py +++ b/Cura/cura_sf/fabmetheus_utilities/euclidean.py @@ -22,13 +22,6 @@ Below are examples of euclidean use. """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import xml_simple_writer diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py index d2914208..8e6d1762 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py @@ -4,12 +4,9 @@ Fabmetheus interpret is a fabmetheus utility to interpret a file, turning it int """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py index 95886ede..e05accf5 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py @@ -10,11 +10,8 @@ The getCarving function takes the file name of an csv file and returns the carvi from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec from fabmetheus_utilities import xml_simple_reader import sys diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py index c4a44ab8..96e96f0b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/dae.py @@ -1,6 +1,4 @@ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import face from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py index 50ed1d9c..c5dd8955 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py @@ -20,14 +20,11 @@ The format described above is the least common denominator to all GTS files. Con from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import face from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __credits__ = 'Nophead \nArt of Illusion ' diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py index 257d82f3..493062f6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py @@ -21,15 +21,12 @@ http://people.sc.fsu.edu/~burkardt/data/obj/obj.html from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import face from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import gcodec -from struct import unpack __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __credits__ = 'Nophead \nArt of Illusion ' diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py index 23b2d190..857ad768 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py @@ -10,12 +10,9 @@ The getCarving function takes the file name of an slc file and returns the carvi from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec from fabmetheus_utilities import svg_writer from struct import unpack import math diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py index 7286297e..cb54bf47 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py @@ -16,14 +16,11 @@ http://gts.sourceforge.net/reference/gts-surfaces.html#GTS-SURFACE-WRITE from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import face from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec from struct import unpack __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py index bfe9e0d5..c88fe063 100644 --- a/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py +++ b/Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py @@ -12,18 +12,13 @@ The getCarving function takes the file name of an svg file and returns the carvi from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.svg_reader import SVGReader from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec from fabmetheus_utilities import svg_writer from fabmetheus_utilities import xml_simple_writer -import math - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __credits__ = 'Nophead \nArt of Illusion ' diff --git a/Cura/cura_sf/fabmetheus_utilities/gcodec.py b/Cura/cura_sf/fabmetheus_utilities/gcodec.py index 04843c62..f795a556 100644 --- a/Cura/cura_sf/fabmetheus_utilities/gcodec.py +++ b/Cura/cura_sf/fabmetheus_utilities/gcodec.py @@ -15,19 +15,14 @@ many lines of text .. """ - from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean import math -import os import sys -import traceback if sys.version_info[0] < 3: import cStringIO diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py index 72fb9ddd..6af23ece 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py @@ -4,18 +4,12 @@ Drill negative solid. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.creation import teardrop from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean -import math __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py index 9904d56e..9a84f14c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py @@ -5,8 +5,6 @@ Svg reader. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py index 15651d7e..4ef34e2a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py index 62e7e6d0..3a30716c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py @@ -4,15 +4,11 @@ Boolean geometry concatenation. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -import math __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py index 665966ff..4dc05de3 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py @@ -4,10 +4,7 @@ Boolean geometry extrusion. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py index 67a4ff62..3e47a66c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py @@ -401,8 +401,6 @@ Defines the amount the thickness of the tooth will multiplied. If when the gear """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py index 78625f6f..b5915dd2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py @@ -4,13 +4,10 @@ Grid path points. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean import math import random diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py index 1f7c9082..6112580b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py @@ -7,20 +7,14 @@ http://en.wikipedia.org/wiki/Netpbm_format """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid -from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities.vector3index import Vector3Index from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean -import math -import random __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py index b61cfaa3..fd0169ba 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py @@ -4,10 +4,7 @@ Boolean geometry extrusion. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py index c0eae8ba..04516831 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py @@ -4,14 +4,11 @@ Square path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py index d972f630..b6516a47 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py @@ -4,8 +4,6 @@ Linear bearing cage. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py index 29f7bbbb..8df2e585 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py @@ -4,12 +4,9 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py index 4a9922ec..f3f0091d 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py @@ -4,8 +4,6 @@ Mechaslab. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation @@ -13,8 +11,6 @@ from fabmetheus_utilities.geometry.creation import peg from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.geometry_utilities import matrix -from fabmetheus_utilities.geometry.manipulation_matrix import translate from fabmetheus_utilities.geometry.solids import cylinder from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py index 01f3126c..12a7b152 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py @@ -4,8 +4,6 @@ Peg. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py index 26e4dc9e..13287538 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py index 457c2de7..509add02 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py @@ -4,8 +4,6 @@ Shaft path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py index 4defa041..9d3bb9ad 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py @@ -6,8 +6,6 @@ Solid has some of the same functions as lineation, however you can not define ge """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path @@ -15,9 +13,7 @@ from fabmetheus_utilities.geometry.geometry_utilities import boolean_geometry from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -import math __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py index 21f63373..49262416 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py @@ -4,8 +4,6 @@ Sponge slice. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py index 68b31bc3..a420296e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py @@ -4,8 +4,6 @@ Square path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py index 87616193..914897b4 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py @@ -4,8 +4,6 @@ Teardrop path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import extrude from fabmetheus_utilities.geometry.creation import lineation diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py index 2545d7dc..cb0e10b9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py @@ -4,8 +4,6 @@ Text vertexes. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_tools import path diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py index f3714d80..93ebde4c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py @@ -5,8 +5,6 @@ Boolean geometry dictionary object. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py index e0e6e369..86c21dc4 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py @@ -4,20 +4,11 @@ Face of a triangle mesh. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.geometry_utilities import matrix -from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities.vector3index import Vector3Index -from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import xml_simple_reader from fabmetheus_utilities import xml_simple_writer import cStringIO -import math __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py index 8ec3db10..92585d6b 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py @@ -4,8 +4,6 @@ Path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import dictionary from fabmetheus_utilities.geometry.geometry_tools import vertex diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py index 0adb4534..290f63a6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py @@ -7,13 +7,10 @@ http://www.w3.org/TR/SVG/paths.html#PathDataEllipticalArcCommands """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean from fabmetheus_utilities import svg_reader import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py index 853729f1..6e3fef11 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py @@ -7,8 +7,6 @@ http://www.w3.org/TR/SVG/paths.html#PathDataCubicBezierCommands """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py index d233d4c2..de7e9c08 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py @@ -7,8 +7,6 @@ http://www.w3.org/TR/SVG/paths.html#PathDataQuadraticBezierCommands """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py index b002ed67..8fd7efdf 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py @@ -4,8 +4,6 @@ Vertex of a triangle mesh. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities import xml_simple_reader diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py index ede07a45..67ec6859 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py @@ -12,8 +12,6 @@ An xml file can be exported from Art of Illusion by going to the "File" menu, th from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import boolean_solid @@ -21,7 +19,6 @@ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -from fabmetheus_utilities import settings from fabmetheus_utilities import xml_simple_writer import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py index 1b2c3038..21282589 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py @@ -12,19 +12,13 @@ An xml file can be exported from Art of Illusion by going to the "File" menu, th from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import group from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec from fabmetheus_utilities import intercircle -import math - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __credits__ = 'Nophead \nArt of Illusion ' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py index 0c968cea..d7ce048c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py @@ -4,17 +4,12 @@ Evaluate expressions. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec -from fabmetheus_utilities import settings import math -import os import sys import traceback diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py index 86f79af7..0ed20e61 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py @@ -4,13 +4,9 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ - from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py index f956591a..473cfeb6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py index 5c166790..a2c37fc1 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from skeinforge_application.skeinforge_utilities import skeinforge_craft import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py index 3c8abefa..b29cd93a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py @@ -4,8 +4,6 @@ Dictionary object attributes. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py index 81711e90..eca10817 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py @@ -4,8 +4,6 @@ List object attributes. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py index f3ab4518..62478a1c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py @@ -4,8 +4,6 @@ String object attributes. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py index 9a244f7c..aecfb30f 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import euclidean import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py index bf4d410e..2f5e20a2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities.vector3index import Vector3Index diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py index f3ec99ef..fbd68282 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py @@ -4,12 +4,8 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean -import math __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py index 199d08f8..cdae9567 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py @@ -4,8 +4,6 @@ Boolean geometry utilities. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ import sys diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py index b4097059..8f87ef0a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py @@ -4,12 +4,9 @@ Boolean geometry four by four matrix. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import xml_simple_writer import cStringIO diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py index 787ea1cf..266fdca9 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py @@ -4,13 +4,10 @@ Boolean geometry scale. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py index a64b2d84..758fb8a3 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py @@ -4,14 +4,9 @@ Boolean geometry rotate. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid -from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix -from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py index 3df0b614..cf8df5b8 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py @@ -4,14 +4,9 @@ Boolean geometry transform. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid -from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix -from fabmetheus_utilities.vector3 import Vector3 -from fabmetheus_utilities import euclidean __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py index fb683986..b2375645 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py @@ -4,8 +4,6 @@ Boolean geometry translation. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import matrix diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py index 4f625468..d26144a4 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py @@ -4,10 +4,7 @@ Boolean geometry array. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.geometry_tools import vertex from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py index 223fb236..19a0610e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py @@ -4,8 +4,6 @@ Boolean geometry carve. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py index ade3b955..0aa0f1f6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py @@ -4,8 +4,6 @@ Boolean geometry copy. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py index 32ebd49e..4a8f2fe7 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py @@ -4,8 +4,6 @@ Boolean geometry disjoin. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import path from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py index f457a84c..c04cc6f0 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py @@ -4,8 +4,6 @@ Boolean geometry group of solids. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.geometry_utilities import evaluate @@ -13,10 +11,6 @@ from fabmetheus_utilities.geometry.solids import group from fabmetheus_utilities import xml_simple_reader from fabmetheus_utilities import xml_simple_writer from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec -from fabmetheus_utilities import settings -import cStringIO import os diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py index f5811687..9fed5da2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py @@ -4,14 +4,10 @@ Boolean geometry write. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean -from fabmetheus_utilities import gcodec import os __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py index 78afcfd5..125f35c6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py @@ -4,11 +4,8 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation -from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py index f3adbf2d..841a798f 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py @@ -4,8 +4,6 @@ Create outline. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py index 9c27bc51..b910f8b2 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py @@ -4,13 +4,10 @@ Create outline. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean from fabmetheus_utilities import intercircle diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py index c913e7d3..8a27f4c8 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py index ef96224f..fb00985a 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py index 57ce3a7e..dce7a7d0 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py index 70800f1e..25d3c94d 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py index 7e109125..9a97eaf6 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py @@ -4,8 +4,6 @@ Boolean geometry bottom. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py index 6e9e2de4..495fe57f 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py @@ -4,15 +4,11 @@ Create inset. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import boolean_solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.vector3index import Vector3Index from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py index 62172141..faadb191 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py @@ -4,17 +4,12 @@ Create inset. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities.evaluate_elements import setting from fabmetheus_utilities.geometry.geometry_utilities import boolean_solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate -from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3index import Vector3Index from fabmetheus_utilities import euclidean from fabmetheus_utilities import intercircle import math diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py index 76b610b4..80621848 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py @@ -4,8 +4,6 @@ Equation for vertexes. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py index 32125521..c59fec95 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py index 4b997d79..3f06c788 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py @@ -4,8 +4,6 @@ Add material to support overhang or remove material at the overhang angle. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_tools import face @@ -13,7 +11,6 @@ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix from fabmetheus_utilities.geometry.manipulation_shapes import flip from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py index 088904f5..6ed84b01 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py @@ -5,8 +5,6 @@ Boolean geometry cube. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py index aa2c46eb..70e16866 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py @@ -5,8 +5,6 @@ Boolean geometry cylinder. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import lineation from fabmetheus_utilities.geometry.creation import solid diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py index 447b6971..296b1727 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py @@ -5,8 +5,6 @@ Boolean geometry difference of solids. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import boolean_solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py index 37de4edb..5785e734 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py @@ -4,8 +4,6 @@ Boolean geometry group of solids. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import dictionary from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py index 04aa15ae..2af192b5 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py @@ -5,8 +5,6 @@ Boolean geometry intersection of solids. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import difference diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py index 91040566..a9801b4c 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py @@ -5,8 +5,6 @@ Boolean geometry sphere. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.creation import solid from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py index 550f4006..308b1dfb 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py @@ -4,11 +4,8 @@ Triangle Mesh holds the faces and edges of a triangular mesh. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_tools import face -from fabmetheus_utilities.geometry.geometry_tools import dictionary from fabmetheus_utilities.geometry.geometry_tools import vertex from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix @@ -21,7 +18,6 @@ from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings import math - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __credits__ = 'Art of Illusion ' __date__ = '$Date: 2008/02/05 $' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py index 7c30deaf..2c2a9543 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py @@ -5,8 +5,6 @@ Boolean geometry union of solids. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.solids import difference diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py index 716dc95c..6f7171a4 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py @@ -8,8 +8,6 @@ The model is xml_models/geometry_utilities/evaluate_fundamentals/print.xml """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py index cb740539..a696481e 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py @@ -4,8 +4,6 @@ Class. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py index 5da7d595..f45e7896 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py index 708c167f..f8a7d248 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py @@ -4,10 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ - -from fabmetheus_utilities.geometry.geometry_utilities import evaluate __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py index 954e9b2e..5772cdb1 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py index d758fa23..9ed32e37 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py index 1519efdb..883bc703 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py index f8bb5c54..50488e88 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py index 805d70e1..8db9c874 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py index 314f0dfe..871e58c3 100644 --- a/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py +++ b/Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py @@ -4,8 +4,6 @@ Polygon path. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate diff --git a/Cura/cura_sf/fabmetheus_utilities/intercircle.py b/Cura/cura_sf/fabmetheus_utilities/intercircle.py index ea448d06..4ab457ee 100644 --- a/Cura/cura_sf/fabmetheus_utilities/intercircle.py +++ b/Cura/cura_sf/fabmetheus_utilities/intercircle.py @@ -4,13 +4,6 @@ Intercircle is a collection of utilities for intersecting circles, used to get s """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py index 9057c4df..3264c797 100644 --- a/Cura/cura_sf/fabmetheus_utilities/settings.py +++ b/Cura/cura_sf/fabmetheus_utilities/settings.py @@ -6,7 +6,6 @@ Settings is a collection of utilities to display, read & write the settings and from __future__ import absolute_import from __future__ import division -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. import sys import types import math diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_reader.py b/Cura/cura_sf/fabmetheus_utilities/svg_reader.py index 96338521..980a1e64 100644 --- a/Cura/cura_sf/fabmetheus_utilities/svg_reader.py +++ b/Cura/cura_sf/fabmetheus_utilities/svg_reader.py @@ -3,10 +3,7 @@ Svg reader. """ - from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities.xml_simple_reader import DocumentNode diff --git a/Cura/cura_sf/fabmetheus_utilities/svg_writer.py b/Cura/cura_sf/fabmetheus_utilities/svg_writer.py index 8a078445..b7332746 100644 --- a/Cura/cura_sf/fabmetheus_utilities/svg_writer.py +++ b/Cura/cura_sf/fabmetheus_utilities/svg_writer.py @@ -6,8 +6,6 @@ Svg_writer uses the layer_template.svg file in the templates folder in the same """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 diff --git a/Cura/cura_sf/fabmetheus_utilities/vector3.py b/Cura/cura_sf/fabmetheus_utilities/vector3.py index e577bb80..6ab8adcc 100644 --- a/Cura/cura_sf/fabmetheus_utilities/vector3.py +++ b/Cura/cura_sf/fabmetheus_utilities/vector3.py @@ -23,13 +23,6 @@ Below are examples of Vector3 use. """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import xml_simple_writer import math diff --git a/Cura/cura_sf/fabmetheus_utilities/vector3index.py b/Cura/cura_sf/fabmetheus_utilities/vector3index.py index 7d46075f..fda13797 100644 --- a/Cura/cura_sf/fabmetheus_utilities/vector3index.py +++ b/Cura/cura_sf/fabmetheus_utilities/vector3index.py @@ -23,13 +23,6 @@ Below are examples of Vector3 use. """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import xml_simple_writer import math diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py index 87a8a08a..9fcfe0d5 100644 --- a/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py +++ b/Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py @@ -29,8 +29,6 @@ many more lines of the xml tree from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.geometry.geometry_utilities import evaluate from fabmetheus_utilities.geometry.geometry_utilities import matrix diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py index 57f4df28..edbaa104 100644 --- a/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py +++ b/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py @@ -5,8 +5,6 @@ XML tag writer utilities. from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py index 99604b2e..415b7ee3 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py @@ -17,8 +17,6 @@ http://forums.reprap.org/file.php?12,file=565 """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import settings diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py index 61b81038..563a7862 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py @@ -7,8 +7,6 @@ The plugin buttons which are commonly used are bolded and the ones which are rar """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py index f55bb2c6..00ff25c9 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py @@ -72,8 +72,6 @@ The alteration tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py index a761b745..c65ffe01 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py @@ -41,10 +41,7 @@ The bottom tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from datetime import date from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.svg_reader import SVGReader from fabmetheus_utilities.vector3 import Vector3 @@ -56,11 +53,7 @@ from fabmetheus_utilities import svg_writer from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import cStringIO -import os import sys -import time - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/02/05 $' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py index b3ad845e..f06753eb 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py @@ -91,13 +91,6 @@ The carve tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -109,11 +102,8 @@ from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile from fabmetheus_utilities.vector3 import Vector3 import math -import os import sys import time -import math - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/02/05 $' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py index 181614ba..1fca0a2b 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py @@ -159,8 +159,6 @@ Screw Holder Bottom_chamber.gcode from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -172,7 +170,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py index 8b0e556b..d37eced1 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py @@ -78,13 +78,6 @@ The chop tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -94,7 +87,6 @@ from fabmetheus_utilities import settings from fabmetheus_utilities import svg_writer from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import os import sys import time diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py index 9ae1ef61..fa5f225c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py @@ -73,13 +73,6 @@ The cleave tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -89,7 +82,6 @@ from fabmetheus_utilities import settings from fabmetheus_utilities import svg_writer from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import os import sys import time diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py index 0edbc214..a3602c27 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py @@ -41,8 +41,6 @@ The clip tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean @@ -53,7 +51,6 @@ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py index f49760f6..7f5b0e6d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py @@ -27,8 +27,6 @@ Screw Holder Bottom_coil.gcode """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh @@ -41,7 +39,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py index 69f2caa2..0f14024e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py @@ -30,13 +30,6 @@ The comb tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -47,7 +40,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py index 84f96d09..3541f530 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py @@ -90,8 +90,6 @@ The cool tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -102,7 +100,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py index 197b1ece..380aa318 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py @@ -93,11 +93,8 @@ The dimension tool has created the file: .. Screw Holder Bottom_dimension.gcode """ +from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ - -from datetime import date from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh from fabmetheus_utilities import archive @@ -109,7 +106,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import math -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py index 6efeec6a..ca462cfc 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py @@ -31,21 +31,16 @@ The drill tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py index 8f175ea4..436c1473 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py @@ -45,13 +45,9 @@ The dwindle tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft @@ -60,7 +56,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import math import sys - __author__ = 'Enrique Perez (perez_enrique aht yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py index c76fbaa9..91fd4f09 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py @@ -100,14 +100,11 @@ The export tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_analyze from skeinforge_application.skeinforge_utilities import skeinforge_craft diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py index 67604fed..a4d1aef4 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py @@ -93,16 +93,14 @@ Byte 14 is worth a few extra notes, this byte is used to define which of the axe """ from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import archive from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings -from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile from struct import Struct import cStringIO -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py index f0abbdf5..e8375ba6 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py @@ -73,16 +73,13 @@ Defines the Z axis step length. from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import archive from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings -from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -from struct import Struct import cStringIO -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py index 4a7e7562..5e21e8c3 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py @@ -58,16 +58,13 @@ Defines the Z axis step length. from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import archive from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings -from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -from struct import Struct import cStringIO -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py index 042da500..5766d409 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py @@ -44,22 +44,16 @@ The feed tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py index 7353ad10..6cb80525 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py @@ -182,13 +182,6 @@ The fill tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py index 231643e8..b040fe3d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py @@ -60,8 +60,6 @@ The fillet tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 @@ -75,7 +73,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_profile import math import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py index c462de7b..82a7f1df 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py @@ -27,8 +27,6 @@ The flow tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py index 56016be7..16fb7611 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py @@ -30,8 +30,6 @@ The home tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 @@ -42,8 +40,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py index 9b4ac36c..411a72f0 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py @@ -43,12 +43,9 @@ The hop tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py index 3a5115ae..7d1ec974 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py @@ -59,13 +59,6 @@ The inset tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh @@ -79,8 +72,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import cmath -import math -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py index aef5bcad..0b3acd3e 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py @@ -33,14 +33,11 @@ The jitter tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py index 80574aa8..8a8f1c1c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py @@ -18,22 +18,14 @@ Defines which layer of the print the joris process starts from. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret -from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import sys - __author__ = 'Daid (daid303@gmail.com' __date__ = '$Date: 2012/24/01 $' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py index 9843d43d..dd5e5a13 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py @@ -40,8 +40,6 @@ The lash tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -52,7 +50,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/21/04 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py index 7e19329b..7c5ffb61 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py @@ -32,8 +32,6 @@ The lift tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive @@ -44,7 +42,6 @@ from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' __date__ = '$Date: 2008/02/05 $' __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py index 48786e6a..66a52123 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py @@ -31,23 +31,15 @@ The limit tool has created the file: .. Screw Holder Bottom_limit.gcode """ +from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ - -from datetime import date from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py index 867e3a99..5b8a018f 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py @@ -54,8 +54,6 @@ Screw Holder Bottom_mill.gcode """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh @@ -68,8 +66,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py index 3ae9461a..ca2d52ec 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py @@ -59,20 +59,16 @@ The multiply tool has created the file: from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py index 234b85f8..fd75a37f 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py @@ -67,12 +67,9 @@ The oozebane tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py index 6bc75292..de181a5c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py @@ -21,13 +21,6 @@ The outset tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py index f39a2609..aa42745f 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py @@ -54,23 +54,17 @@ The preface tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from datetime import date, datetime from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.svg_reader import SVGReader from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings -from fabmetheus_utilities import svg_writer from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile from time import strftime -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py index c364cf91..615bc7e7 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py @@ -195,8 +195,6 @@ Screw Holder Bottom_raft.gcode """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py index d644079d..12a636eb 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py @@ -44,25 +44,18 @@ The scale tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ -from datetime import date from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.svg_reader import SVGReader from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from fabmetheus_utilities import svg_writer from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import cStringIO -import os import sys -import time __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py index d3ea4ea9..a447f6e3 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py @@ -60,8 +60,6 @@ The skin tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py index 9dae4183..5b8e0959 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py @@ -57,12 +57,9 @@ The skirt tool has created the file: from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.solids import triangle_mesh -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec @@ -71,7 +68,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py index 0a386e36..0838098d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py @@ -39,8 +39,6 @@ The smooth tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py index 0653f57f..e42a7b61 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py @@ -117,19 +117,15 @@ The speed tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py index 7404029c..d1babb18 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py @@ -57,12 +57,9 @@ The splodge tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py index cb82ed33..0cb1430c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py @@ -67,15 +67,11 @@ The stretch tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret -from fabmetheus_utilities.vector3 import Vector3 from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py index 0a1a8b90..0775100b 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py @@ -75,19 +75,14 @@ The temperature tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py index 500ad860..4efe8ad3 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py @@ -40,8 +40,6 @@ The tower tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py index 1827bd47..c46ff90d 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py @@ -36,19 +36,14 @@ The unpause tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive -from fabmetheus_utilities import euclidean from fabmetheus_utilities import gcodec -from fabmetheus_utilities import intercircle from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py index 38130dc8..147e4085 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py @@ -27,8 +27,6 @@ The whittle tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py index cc612376..f6866278 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py @@ -29,13 +29,6 @@ The widen tool has created the file: """ from __future__ import absolute_import -try: - import psyco - psyco.full() -except: - pass -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.geometry.geometry_utilities import boolean_solid @@ -48,7 +41,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import os import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py index ac662ec0..04de7e47 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py @@ -80,8 +80,6 @@ The wipe tool has created the file: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities.vector3 import Vector3 @@ -92,7 +90,6 @@ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import math import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py index 87253289..c4861e31 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py @@ -40,8 +40,6 @@ The help menu has an item for each button on the help page. Also, at the very t """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_help diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py index 8b9ec49e..1b256c7a 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py @@ -5,8 +5,6 @@ Meta is a script to access the plugins which handle meta information. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import settings diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py index 8ce2a725..d823413c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py @@ -17,8 +17,6 @@ This brings up the description dialog. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py index 6d377b7e..1e0299c8 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py @@ -21,8 +21,6 @@ This brings up the polyfile dialog. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from skeinforge_application.skeinforge_utilities import skeinforge_polyfile diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py index 808d482d..d1b44816 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py @@ -12,8 +12,6 @@ To change the profile setting, in a shell in the profile folder type: """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import euclidean diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py index 0cc3c51f..e4637128 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py @@ -15,7 +15,7 @@ To change the cutting profile, in a shell in the profile_plugins folder type: from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py index e8f9a9a9..1168cc3a 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py @@ -15,7 +15,7 @@ To change the extrusion profile, in a shell in the profile_plugins folder type: from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py index fd682b71..443eddc8 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py @@ -15,7 +15,7 @@ To change the milling profile, in a shell in the profile_plugins folder type: from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py index 4cbd165e..39c0b3a8 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py @@ -15,7 +15,7 @@ To change the winding profile, in a shell in the profile_plugins folder type: from __future__ import absolute_import -import __init__ + from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile import sys diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py index 26e30ae1..5dbb98b1 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py @@ -4,15 +4,11 @@ Analyze is a script to access the plugins which analyze a gcode file. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_polyfile from skeinforge_application.skeinforge_utilities import skeinforge_profile -import os import sys import traceback diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py index bbd30242..4f6db476 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py @@ -6,8 +6,6 @@ The plugin buttons which are commonly used are bolded and the ones which are rar """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret from fabmetheus_utilities import archive diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py index 6dad5c75..7f41ef6c 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py @@ -4,8 +4,6 @@ Help has buttons and menu items to open help, blog and forum pages in your prima """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import settings diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py index b03b9f1b..e0c6f68b 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py @@ -4,14 +4,10 @@ Meta is a script to access the plugins which handle meta information. """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive -from fabmetheus_utilities import gcodec from fabmetheus_utilities import settings from skeinforge_application.skeinforge_utilities import skeinforge_profile -import os __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py index 03f4c418..2343cb62 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py @@ -4,8 +4,6 @@ Polyfile is a script to choose whether the skeinforge toolchain will operate on """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive from fabmetheus_utilities import settings diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py index 38f8c9c2..967b0980 100644 --- a/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py +++ b/Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py @@ -6,8 +6,6 @@ Profile presents the user with a choice of the craft types in the profile_plugin """ from __future__ import absolute_import -#Init has to be imported first because it has code to workaround the python bug where relative imports don't work if the module is imported as a main module. -import __init__ from fabmetheus_utilities import archive