Fixed the imports.

diff --git a/Cura/cura.py b/Cura/cura.py
index 44eca432db120f46045a6eb2795e8023ed83f305..abc2163d128fbe89f70a8c2b904ba08e7a732358 100644 (file)
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -16,7 +16,7 @@ from optparse import OptionParser
 
 import wx._core
 
-from util import profile
+from Cura.util import profile
 
 __author__ = 'Daid'
 __credits__ = """
@@ -75,25 +75,25 @@ def main():
                profile.loadGlobalProfile(options.profileini)
 
        if options.openprojectplanner is not None:
-               from gui import projectPlanner
+               from Cura.gui import projectPlanner
                projectPlanner.main()
        elif options.openflatslicer is not None:
-               from gui import flatSlicerWindow
+               from Cura.gui import flatSlicerWindow
                flatSlicerWindow.main()
        elif options.printfile is not None:
-               from gui import printWindow
+               from Cura.gui import printWindow
                printWindow.startPrintInterface(options.printfile)
        elif options.slice is not None:
-               from util import sliceRun
+               from Cura.util import sliceRun
                sliceRun.runSlice(args)
        else:
                if len(args) > 0:
                        profile.putPreference('lastFile', ';'.join(args))
 
-               from gui import splashScreen
+               from Cura.gui import splashScreen
 
                def mainWindowRunCallback(splash):
-                       from gui import mainWindow
+                       from Cura.gui import mainWindow
                        if splash is not None:
                                splash.Show(False)
                        mainWindow.main()

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index cc9a7a29cf3bcc9d3904ed224b70b49bcc586171..9057c4df8601ed5b610582f377e3634aaac04520 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -5,14 +5,14 @@ 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 __init__
 
-import os, sys
-import types, math
+#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
 
-from util import profile
-from fabmetheus_utilities import archive
+from Cura.util import profile
+from Cura.cura_sf.fabmetheus_utilities import archive
 
 def DEFSET(setting):
        return setting.value

diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py
index e2a6edd0ddb6e86e69811657bc80f908b2ee5273..e67b21171c18c6b5dfa537629e2968b361d52679 100644 (file)
--- a/Cura/gui/alterationPanel.py
+++ b/Cura/gui/alterationPanel.py
@@ -1,8 +1,9 @@
-import wx,wx.stc
-import sys,math,threading,os
+from __future__ import absolute_import
 
-from gui import gcodeTextArea
-from util import profile
+import wx, wx.stc
+
+from Cura.gui import gcodeTextArea
+from Cura.util import profile
 
 class alterationPanel(wx.Panel):
        def __init__(self, parent):

diff --git a/Cura/gui/batchRun.py b/Cura/gui/batchRun.py
index df6ac924d9df841c2b450ad080fa2910340bb520..91e6c5685447f1a726394907eac801892092ea03 100644 (file)
--- a/Cura/gui/batchRun.py
+++ b/Cura/gui/batchRun.py
@@ -1,12 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
 import wx, os, platform, types, webbrowser, math, subprocess, multiprocessing, threading, time, re, shutil
 
-from util import profile
-from util import sliceRun
-from util import meshLoader
-from gui import dropTarget
+from Cura.util import profile
+from Cura.util import sliceRun
+from Cura.util import meshLoader
+from Cura.gui import dropTarget
 
 class batchRunWindow(wx.Frame):
        def __init__(self, parent):

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 4e8a1d683bf8a56a78d18357badd9ff65cc72fca..653a2b6e3a34abf4622929b59fa4333551d29c61 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -1,15 +1,9 @@
 from __future__ import absolute_import
-import __init__
 
 import wx, wx.lib.stattext, os, sys, platform, types
 
-from util import validators
-from util import profile
-
-def main():
-       app = wx.App(False)
-       mainWindow()
-       app.MainLoop()
+from Cura.util import validators
+from Cura.util import profile
 
 class configWindowBase(wx.Frame):
        "A base class for configuration dialogs. Handles creation of settings, and popups"

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index f782555c7f5098ad9f678f1e068badb690ab8edf..0508f9501eeac88280ae5b0705c7a122e6648b98 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -8,12 +8,11 @@ import time
 import wx
 import wx.wizard
 
-from gui import firmwareInstall
-from gui import toolbarUtil
-from gui import printWindow
-from util import machineCom
-from util import profile
-from util.resources import getPathForImage
+from Cura.gui import firmwareInstall
+from Cura.gui import printWindow
+from Cura.util import machineCom
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 class InfoBox(wx.Panel):
        def __init__(self, parent):
@@ -297,8 +296,8 @@ class SelectParts(InfoPage):
                profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))
                if self.dualExtrusion.GetValue():
                        profile.putPreference('extruder_amount', '2')
-               if getPreference('ultimaker_extruder_upgrade') == 'True':
-                       putProfileSetting('retraction_enable', 'True')
+               if profile.getPreference('ultimaker_extruder_upgrade') == 'True':
+                       profile.putProfileSetting('retraction_enable', 'True')
 
 
 class FirmwareUpgradePage(InfoPage):

diff --git a/Cura/gui/dropTarget.py b/Cura/gui/dropTarget.py
index 54f52a13b26cdaad7d9767befbf7b3b6fd1ad94c..bb3c2b461d5c016a5355ee1892ee30c951faf2bb 100644 (file)
--- a/Cura/gui/dropTarget.py
+++ b/Cura/gui/dropTarget.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import __init__
 
 import wx
 
@@ -12,7 +11,7 @@ class FileDropTarget(wx.FileDropTarget):
 
        def OnDropFiles(self, x, y, filenames):
                filteredList = []
-               if self.filenameFilter != None:
+               if self.filenameFilter is not None:
                        for f in filenames:
                                for ext in self.filenameFilter:
                                        if f.endswith(ext) or f.endswith(ext.upper()):

diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py
index c612ef93ac7ba619ae8d5e3b49499206f4970e32..6ba252ad7c2d9ab4bb24c4b6f1128514567fc380 100644 (file)
--- a/Cura/gui/expertConfig.py
+++ b/Cura/gui/expertConfig.py
@@ -1,14 +1,9 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types
-import ConfigParser
+import wx
 
-from gui import configBase
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import alterationPanel
-from util import validators
+from Cura.gui import configBase
+from Cura.util import validators
 
 class expertConfigWindow(configBase.configWindowBase):
        "Expert configuration window"

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index ddd11037f70376fbdf7437e7e7f87c9ec813f673..c9d086bc90fbddf330f9d1e09558f94e36ec82ee 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -1,16 +1,13 @@
 from __future__ import absolute_import
-import __init__
 
-import os, glob, wx, threading, sys, time
+import os, wx, threading, sys
 
-from serial import Serial
+from Cura.avr_isp import stk500v2
+from Cura.avr_isp import ispBase
+from Cura.avr_isp import intelHex
 
-from avr_isp import stk500v2
-from avr_isp import ispBase
-from avr_isp import intelHex
-
-from util import machineCom
-from util import profile
+from Cura.util import machineCom
+from Cura.util import profile
 
 def getDefaultFirmware():
        if profile.getPreference('machine_type') == 'ultimaker':

diff --git a/Cura/gui/flatSlicerWindow.py b/Cura/gui/flatSlicerWindow.py
index 4c8f1d913a36aa85f4f2b8a785981007ab9981e6..a5de99c43c33a62c0a853c6552e078699a1c2e18 100644 (file)
--- a/Cura/gui/flatSlicerWindow.py
+++ b/Cura/gui/flatSlicerWindow.py
@@ -1,7 +1,10 @@
-import wx, os, platform, types, webbrowser
+from __future__ import absolute_import
 
-from wx import glcanvas
 import wx
+import os
+
+from wx import glcanvas
+
 try:
        import OpenGL
        OpenGL.ERROR_CHECKING = False
@@ -12,12 +15,12 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from gui import toolbarUtil
-from gui import opengl
-from util import util3d
-from util import svg
-from util import profile
-from util import version
+from Cura.gui import toolbarUtil
+from Cura.gui import opengl
+from Cura.util import util3d
+from Cura.util import svg
+from Cura.util import profile
+from Cura.util import version
 
 class flatSlicerWindow(wx.Frame):
        "Cura 2D SVG slicer"

diff --git a/Cura/gui/gcodeTextArea.py b/Cura/gui/gcodeTextArea.py
index 8cdb482ab411de52025b07c68e84bc10a39a54b5..f6734eca52b3d24e8eeab03c78b47bd548a56939 100644 (file)
--- a/Cura/gui/gcodeTextArea.py
+++ b/Cura/gui/gcodeTextArea.py
@@ -1,7 +1,10 @@
-import wx, wx.stc
-import sys,math,os
+from __future__ import absolute_import
 
-from util import profile
+import wx
+import wx.stc
+import sys
+
+from Cura.util import profile
 
 class GcodeTextArea(wx.stc.StyledTextCtrl):
        def __init__(self, parent):

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index d435194efdbbb7527a18aca454475845a18f335a..e606ef5ee413be35221ec8c111bd8ea2643d829a 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -1,29 +1,33 @@
 from __future__ import absolute_import
-import __init__
-
-import wx, os, platform, types, webbrowser, shutil, glob
-
-from gui import configBase
-from gui import expertConfig
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import alterationPanel
-from gui import pluginPanel
-from gui import preferencesDialog
-from gui import configWizard
-from gui import firmwareInstall
-from gui import printWindow
-from gui import simpleMode
-from gui import projectPlanner
-from gui import batchRun
-from gui import flatSlicerWindow
-from gui import icon
-from gui import dropTarget
-from util import validators
-from util import profile
-from util import version
-from util import sliceRun
-from util import meshLoader
+
+import wx
+import os
+import platform
+import webbrowser
+import shutil
+import glob
+
+from Cura.gui import configBase
+from Cura.gui import expertConfig
+from Cura.gui import preview3d
+from Cura.gui import sliceProgessPanel
+from Cura.gui import alterationPanel
+from Cura.gui import pluginPanel
+from Cura.gui import preferencesDialog
+from Cura.gui import configWizard
+from Cura.gui import firmwareInstall
+from Cura.gui import printWindow
+from Cura.gui import simpleMode
+from Cura.gui import projectPlanner
+from Cura.gui import batchRun
+from Cura.gui import flatSlicerWindow
+from Cura.gui import icon
+from Cura.gui import dropTarget
+from Cura.util import validators
+from Cura.util import profile
+from Cura.util import version
+from Cura.util import sliceRun
+from Cura.util import meshLoader
 
 def main():
        #app = wx.App(False)

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 78bd8fd4aeeaf3e9de484f6f2932fcbce783b6a3..4db99fdb077aaa8e41890118421407a99dff0639 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -3,10 +3,10 @@ from __future__ import absolute_import
 
 import math
 
-from util import meshLoader
-from util import util3d
-from util import profile
-from util.resources import getPathForMesh
+from Cura.util import meshLoader
+from Cura.util import util3d
+from Cura.util import profile
+from Cura.util.resources import getPathForMesh
 
 try:
        import OpenGL

diff --git a/Cura/gui/pluginPanel.py b/Cura/gui/pluginPanel.py
index 204693afe02c975c01635af1d2711daef06f572a..a7e1dd92af3902ea26ed229c14279c31cf444f10 100644 (file)
--- a/Cura/gui/pluginPanel.py
+++ b/Cura/gui/pluginPanel.py
@@ -1,9 +1,11 @@
-import wx, wx.stc
-import sys, math, threading, os, webbrowser
+from __future__ import absolute_import
+
+import wx
+import webbrowser
 from wx.lib import scrolledpanel
 
-from util import profile
-from util import exporer
+from Cura.util import profile
+from Cura.util import exporer
 
 class pluginPanel(wx.Panel):
        def __init__(self, parent):

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 937778294f3160b24bd62168a1954215467c2ed3..2a6d325fa4abc00b835fdb39037e720eb18b2f76 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -1,13 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, string, glob, stat
-import ConfigParser
+import wx
 
-from gui import configBase
-from util import validators
-from util import machineCom
-from util import profile
+from Cura.gui import configBase
+from Cura.util import validators
+from Cura.util import machineCom
+from Cura.util import profile
 
 class preferencesDialog(configBase.configWindowBase):
        def __init__(self, parent):

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index c689b7f9ad161f15868fc3a8f45462c660846050..ddfa93e40eaed7d229e4ce91f816f21434743e6b 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -1,6 +1,11 @@
+from __future__ import absolute_import
 from __future__ import division
 
-import sys, math, threading, re, time, os
+import math
+import threading
+import re
+import time
+import os
 import numpy
 
 from wx import glcanvas
@@ -15,14 +20,14 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from gui import opengl
-from gui import toolbarUtil
+from Cura.gui import opengl
+from Cura.gui import toolbarUtil
 
-from util import profile
-from util import gcodeInterpreter
-from util import meshLoader
-from util import util3d
-from util import sliceRun
+from Cura.util import profile
+from Cura.util import gcodeInterpreter
+from Cura.util import meshLoader
+from Cura.util import util3d
+from Cura.util import sliceRun
 
 class previewObject():
        def __init__(self):

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 145fd7c96266783bad65e8f4fe9f35d40c4d1783..04820877ac5acc06d0e19255ce46cc8efc44363f 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -11,15 +11,12 @@ import platform
 import wx
 from wx.lib import buttons
 
-from gui import icon
-from gui import toolbarUtil
-from gui import webcam
-from gui import taskbar
-from util import machineCom
-from util import profile
-from util import gcodeInterpreter
-from util import power
-from util.resources import getPathForImage
+from Cura.gui import webcam
+from Cura.gui import taskbar
+from Cura.util import machineCom
+from Cura.util import gcodeInterpreter
+from Cura.util import power
+from Cura.util.resources import getPathForImage
 
 printWindowMonitorHandle = None
 

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index dc3a53b996bf6895d4d878be51517814bf9ed1a4..32a294576229eae5d17ad9aa861aa58a5d75a10f 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -1,7 +1,11 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, webbrowser, math, subprocess, threading, time, re, shutil
+import wx
+import os
+import threading
+import time
+import re
+import shutil
 import ConfigParser
 import numpy
 
@@ -16,22 +20,21 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
        hasOpenGLlibs = False
 
-from gui import opengl
-from gui import toolbarUtil
-from gui import icon
-from gui import configBase
-from gui import printWindow
-from gui import dropTarget
-from gui import taskbar
-from util import validators
-from util import profile
-from util import util3d
-from util import meshLoader
-from util import stl
-from util import mesh
-from util import sliceRun
-from util import gcodeInterpreter
-from util import exporer
+from Cura.gui import opengl
+from Cura.gui import toolbarUtil
+from Cura.gui import configBase
+from Cura.gui import printWindow
+from Cura.gui import dropTarget
+from Cura.gui import taskbar
+from Cura.util import validators
+from Cura.util import profile
+from Cura.util import util3d
+from Cura.util import meshLoader
+from Cura.util import stl
+from Cura.util import mesh
+from Cura.util import sliceRun
+from Cura.util import gcodeInterpreter
+from Cura.util import exporer
 
 class Action(object):
        pass

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 69eb7b4416211a7c5d35d06bc0152733f91eda5d..87e63cacf50a332cc04e41a8f43c9ad5f35d6643 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -1,22 +1,19 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, os, platform, types, webbrowser
+import wx
+import os
+import webbrowser
 
-from gui import configBase
-from gui import preview3d
-from gui import sliceProgessPanel
-from gui import preferencesDialog
-from gui import configWizard
-from gui import firmwareInstall
-from gui import dropTarget
-from gui import printWindow
-from gui import icon
-from util import validators
-from util import profile
-from util import version
-from util import sliceRun
-from util import meshLoader
+from Cura.gui import configBase
+from Cura.gui import preview3d
+from Cura.gui import sliceProgessPanel
+from Cura.gui import preferencesDialog
+from Cura.gui import dropTarget
+from Cura.gui import printWindow
+from Cura.util import profile
+from Cura.util import version
+from Cura.util import sliceRun
+from Cura.util import meshLoader
 
 class simpleModeWindow(configBase.configWindowBase):
        "Main user interface window for Quickprint mode"

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 52411cf4ae298b27bcb15e936a48be5f29c17436..091e444d6ad66eb1cbbbc1f46eba8392697be3ad 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -1,14 +1,19 @@
 from __future__ import absolute_import
-import __init__
 
-import wx, sys, os, shutil, math, threading, subprocess, time, re, platform
+import wx
+import os
+import shutil
+import threading
+import time
+import re
+import platform
 
-from gui import taskbar
-from gui import preferencesDialog
-from util import profile
-from util import sliceRun
-from util import exporer
-from util import gcodeInterpreter
+from Cura.gui import taskbar
+from Cura.gui import preferencesDialog
+from Cura.util import profile
+from Cura.util import sliceRun
+from Cura.util import exporer
+from Cura.util import gcodeInterpreter
 
 class sliceProgessPanel(wx.Panel):
        def __init__(self, mainWindow, parent, filelist):

diff --git a/Cura/gui/splashScreen.py b/Cura/gui/splashScreen.py
index 2654980fa84de2afdb02b99d09e13243cbc0826b..544fb28c286cb4889ec4eef45e7a29ebf99549ee 100644 (file)
--- a/Cura/gui/splashScreen.py
+++ b/Cura/gui/splashScreen.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 
 import wx._core #We only need the core here, which speeds up the import. As we want to show the splashscreen ASAP.
 
-from util.resources import getPathForImage
+from Cura.util.resources import getPathForImage
 
 
 class splashScreen(wx.SplashScreen):

diff --git a/Cura/gui/taskbar.py b/Cura/gui/taskbar.py
index f22e721789173ffc84c03a6a0b43c13ccf33b215..c3dc4f3d4f95909a93f72358ae25456305902cf4 100644 (file)
--- a/Cura/gui/taskbar.py
+++ b/Cura/gui/taskbar.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 try:
        import comtypes.client as cc
        cc.GetModule('taskbarlib.tlb')

diff --git a/Cura/gui/toolbarUtil.py b/Cura/gui/toolbarUtil.py
index 62f4d6d85ff452edef14bfe474df005ffe9bdef3..2a6ba81f4c1a1099577b883a7cb2cefe97ae971f 100644 (file)
--- a/Cura/gui/toolbarUtil.py
+++ b/Cura/gui/toolbarUtil.py
@@ -5,8 +5,8 @@ from __future__ import division
 import wx
 from wx.lib import buttons
 
-from util import profile
-from util.resources import getPathForImage
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 
 #######################################################

diff --git a/Cura/gui/webcam.py b/Cura/gui/webcam.py
index 56d28260c200eb9bcd11bdedb3f9adfda2170149..59e77ff4e22848826de900b335078ed155182b43 100644 (file)
--- a/Cura/gui/webcam.py
+++ b/Cura/gui/webcam.py
@@ -8,9 +8,8 @@ import platform
 
 import wx
 
-from util import profile
-from util.resources import getPathForImage
-from gui import toolbarUtil
+from Cura.util import profile
+from Cura.util.resources import getPathForImage
 
 try:
        #Try to find the OpenCV library for video capture.

diff --git a/Cura/util/dae.py b/Cura/util/dae.py
index deae1a8072af20c667ee4a0b571b1ff2244c2473..4332ea16db9a0038851a3b6030e9b7770f311a2e 100644 (file)
--- a/Cura/util/dae.py
+++ b/Cura/util/dae.py
@@ -1,7 +1,8 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
+
 from  xml.parsers.expat import ParserCreate
 
-import mesh
+from Cura.util import mesh
 
 class daeModel(mesh.mesh):
        def __init__(self):

diff --git a/Cura/util/exporer.py b/Cura/util/exporer.py
index 7ca6d3e497f25a38cd867dd33f009995c671ec3e..9bf2cc0bce9cea7a93fc416a4aa62f1ced6ae7f4 100644 (file)
--- a/Cura/util/exporer.py
+++ b/Cura/util/exporer.py
@@ -1,4 +1,8 @@
-import sys, os, subprocess
+from __future__ import absolute_import
+
+import sys
+import os
+import subprocess
 
 def hasExporer():
        if sys.platform == 'win32' or sys.platform == 'cygwin' or sys.platform == 'darwin':

diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
index 8d6978bf10d53d63ffde35932b3e60d6e658bc59..1de7a6bfe066fc2adf0cd3c694a9f3a4a6fcf4df 100644 (file)
--- a/Cura/util/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -1,10 +1,12 @@
+from __future__ import absolute_import
+
 import sys
 import math
 import re
 import os
 
-import util3d
-import profile
+from Cura.util import util3d
+from Cura.util import profile
 
 class gcodePath(object):
        def __init__(self, newType, pathType, layerThickness, startPoint):

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index 5f1f301e0fba968e90737bed7b26c27b6e33aa63..2a826144beb723b97bb0d3b72960f7d3ca2832ff 100644 (file)
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -1,17 +1,22 @@
 from __future__ import absolute_import
-import __init__
 
-import os, glob, sys, time, math, re, traceback, threading
+import os
+import glob
+import sys
+import time
+import math
+import re
+import traceback
+import threading
 import Queue as queue
 
 import serial
 
-from avr_isp import stk500v2
-from avr_isp import ispBase
-from avr_isp import intelHex
+from Cura.avr_isp import stk500v2
+from Cura.avr_isp import ispBase
 
-from util import profile
-from util import version
+from Cura.util import profile
+from Cura.util import version
 
 try:
        import _winreg

diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py
index 89d96b76c3dd5562fd9a895e53678c4d683fb52f..a5ed6f8ee0f77cd97832735f4caa73b6574afb4e 100644 (file)
--- a/Cura/util/mesh.py
+++ b/Cura/util/mesh.py
@@ -1,9 +1,12 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import util3d
+import time
+import math
 
 import numpy
 
+from Cura.util import util3d
+
 class mesh(object):
        def __init__(self):
                self.vertexes = None

diff --git a/Cura/util/meshLoader.py b/Cura/util/meshLoader.py
index cb45c4b01f2cf054cf5a525cd76ed247967205ce..db0f3dbfcf7bcb454eb98cf3f77ecbc43bbba89a 100644 (file)
--- a/Cura/util/meshLoader.py
+++ b/Cura/util/meshLoader.py
@@ -1,7 +1,8 @@
+from __future__ import absolute_import
 
-import stl
-import obj
-import dae
+from Cura.util import stl
+from Cura.util import obj
+from Cura.util import dae
 
 def supportedExtensions():
        return ['.stl', '.obj', '.dae']

diff --git a/Cura/util/obj.py b/Cura/util/obj.py
index ed199d71177f8a60e213b8760353ebf4cbedba98..f2261c10dadd5865e75bd1878fd3f0914c151808 100644 (file)
--- a/Cura/util/obj.py
+++ b/Cura/util/obj.py
@@ -1,6 +1,6 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import mesh
+from Cura.util import mesh
 
 class objModel(mesh.mesh):
        def __init__(self):

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 485d427024b7ee3207548fc85e643dcaedbe09c3..fddfa846d5ef0fd8301fdc0d3f3b43cdf2771943 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -1,7 +1,5 @@
 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 __init__
 
 import os, traceback, math, re, zlib, base64, time, sys, platform, glob, string, stat
 import cPickle as pickle
@@ -10,7 +8,7 @@ if sys.version_info[0] < 3:
 else:
        import configparser as ConfigParser
 
-from util import version
+from Cura.util import version
 
 #########################################################
 ## Default settings when none are found.

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index 3bd6942df4a16018490185b5097c5fe6a255d85d..e749e48bf69fd81789a173458dc1f452b6ae5001 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -1,14 +1,17 @@
 from __future__ import absolute_import
 
-import platform, os, subprocess, sys
+import platform
+import os
+import subprocess
+import sys
 
 if not hasattr(sys, 'frozen'):
        cura_sf_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../cura_sf/"))
        if cura_sf_path not in sys.path:
                sys.path.append(cura_sf_path)
-       from skeinforge_application.skeinforge_utilities import skeinforge_craft
+       from Cura.cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
 
-from util import profile
+from Cura.util import profile
 
 #How long does each step take compared to the others. This is used to make a better scaled progress bar, and guess time left.
 sliceStepTimeFactor = {

diff --git a/Cura/util/stl.py b/Cura/util/stl.py
index 699e0aa23dd532bc76ebfa3f8ecaf6714dde0471..7da475bd90db6d17425170b3623df2998f2974a4 100644 (file)
--- a/Cura/util/stl.py
+++ b/Cura/util/stl.py
@@ -1,6 +1,11 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
 
-import mesh
+import sys
+import os
+import struct
+import time
+
+from Cura.util import mesh
 
 class stlModel(mesh.mesh):
        def __init__(self):

diff --git a/Cura/util/svg.py b/Cura/util/svg.py
index 6485e930fa20331919573cb94ba871bbe5deea26..9f44f37ca9af30f24a0b72529e12b8cd27018cce 100644 (file)
--- a/Cura/util/svg.py
+++ b/Cura/util/svg.py
@@ -1,4 +1,6 @@
-import sys, math, re, os, struct, time
+from __future__ import absolute_import
+
+import math
 from xml.etree import ElementTree
 
 import profile

diff --git a/Cura/util/util3d.py b/Cura/util/util3d.py
index 423d4f2fd2c670667f23e4dff31e1191c2edeee1..e599447836d83f240d9cb0b5677a474e550188a3 100644 (file)
--- a/Cura/util/util3d.py
+++ b/Cura/util/util3d.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import math
 import numpy
 

diff --git a/Cura/util/validators.py b/Cura/util/validators.py
index db775eff3e242762db9acaea1ae3ec97ca6ac182..18812cd96ce90640ae08f886fdbd0da636504ad0 100644 (file)
--- a/Cura/util/validators.py
+++ b/Cura/util/validators.py
@@ -1,11 +1,10 @@
 from __future__ import absolute_import
 from __future__ import division
-import __init__
 
 import types
 import math
 
-from util import profile
+from Cura.util import profile
 
 SUCCESS = 0
 WARNING = 1

diff --git a/Cura/util/version.py b/Cura/util/version.py
index 052ab7bd62dc63424712d363bb8e010d6622e73d..ce3c934c37146d002b30d1d4b9a798d48ac342ab 100644 (file)
--- a/Cura/util/version.py
+++ b/Cura/util/version.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 
 def getVersion(getGitVersion = True):