From: daid Date: Thu, 30 Jan 2014 08:09:30 +0000 (+0100) Subject: Remove all the absolute imports, as they are unneeded. X-Git-Tag: 14.02-RC1~44 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=82ddb7c87a3e41dfcf9fd53b5bb4873b8c066123;p=cura.git Remove all the absolute imports, as they are unneeded. --- diff --git a/Cura/cura.py b/Cura/cura.py index dadb2238..2208d983 100644 --- a/Cura/cura.py +++ b/Cura/cura.py @@ -6,7 +6,6 @@ This page is in the table of contents. Cura is a AGPL tool chain to generate a GCode path for 3D printing. Older versions of Cura where based on Skeinforge. Versions up from 13.05 are based on a C++ engine called CuraEngine. """ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from optparse import OptionParser diff --git a/Cura/gui/aboutWindow.py b/Cura/gui/aboutWindow.py index 703f0086..0e713b7c 100644 --- a/Cura/gui/aboutWindow.py +++ b/Cura/gui/aboutWindow.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py index db7350ba..a61962f7 100644 --- a/Cura/gui/alterationPanel.py +++ b/Cura/gui/alterationPanel.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx, wx.stc diff --git a/Cura/gui/app.py b/Cura/gui/app.py index 47932c60..b58704cf 100644 --- a/Cura/gui/app.py +++ b/Cura/gui/app.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index a6c45a9f..a04db456 100644 --- a/Cura/gui/configBase.py +++ b/Cura/gui/configBase.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import division __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index d0273bc4..94e9ca4b 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py index e82ae710..c871d1df 100644 --- a/Cura/gui/expertConfig.py +++ b/Cura/gui/expertConfig.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py index a927b24d..ff45017b 100644 --- a/Cura/gui/firmwareInstall.py +++ b/Cura/gui/firmwareInstall.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 8bc54b62..d0e036a1 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/pluginPanel.py b/Cura/gui/pluginPanel.py index b57ee5f3..330fcb26 100644 --- a/Cura/gui/pluginPanel.py +++ b/Cura/gui/pluginPanel.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index 28a77bda..0f8dd10f 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 1a0e2cbe..3ede0d22 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import threading diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index d37a0c06..6eda047b 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index 647e516d..94d9dadf 100644 --- a/Cura/gui/simpleMode.py +++ b/Cura/gui/simpleMode.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/splashScreen.py b/Cura/gui/splashScreen.py index d3aa4f6d..e2a2613a 100644 --- a/Cura/gui/splashScreen.py +++ b/Cura/gui/splashScreen.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx._core #We only need the core here, which speeds up the import. As we want to show the splashscreen ASAP. diff --git a/Cura/gui/tools/batchRun.py b/Cura/gui/tools/batchRun.py index 14c1e562..5a3078dd 100644 --- a/Cura/gui/tools/batchRun.py +++ b/Cura/gui/tools/batchRun.py @@ -1,5 +1,4 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" -from __future__ import absolute_import import wx, os, multiprocessing, threading, time, shutil diff --git a/Cura/gui/tools/minecraftImport.py b/Cura/gui/tools/minecraftImport.py index 8de17012..d63e977b 100644 --- a/Cura/gui/tools/minecraftImport.py +++ b/Cura/gui/tools/minecraftImport.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/tools/pidDebugger.py b/Cura/gui/tools/pidDebugger.py index 551dc31f..816d8e14 100644 --- a/Cura/gui/tools/pidDebugger.py +++ b/Cura/gui/tools/pidDebugger.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/tools/youmagineGui.py b/Cura/gui/tools/youmagineGui.py index ef351e50..b6304850 100644 --- a/Cura/gui/tools/youmagineGui.py +++ b/Cura/gui/tools/youmagineGui.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/util/dropTarget.py b/Cura/gui/util/dropTarget.py index 38481136..a02acaa6 100644 --- a/Cura/gui/util/dropTarget.py +++ b/Cura/gui/util/dropTarget.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/util/gcodeTextArea.py b/Cura/gui/util/gcodeTextArea.py index 484af664..38a621c2 100644 --- a/Cura/gui/util/gcodeTextArea.py +++ b/Cura/gui/util/gcodeTextArea.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py index 7cf19b3d..39b435c2 100644 --- a/Cura/gui/util/opengl.py +++ b/Cura/gui/util/opengl.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py index c9b0eeeb..fc4c12d1 100644 --- a/Cura/gui/util/openglGui.py +++ b/Cura/gui/util/openglGui.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import division __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" diff --git a/Cura/gui/util/previewTools.py b/Cura/gui/util/previewTools.py index 372d9cf2..d90feb48 100644 --- a/Cura/gui/util/previewTools.py +++ b/Cura/gui/util/previewTools.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/gui/util/taskbar.py b/Cura/gui/util/taskbar.py index 533eff24..feb95d49 100644 --- a/Cura/gui/util/taskbar.py +++ b/Cura/gui/util/taskbar.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" try: diff --git a/Cura/gui/util/toolbarUtil.py b/Cura/gui/util/toolbarUtil.py index b4934a4a..44a33f11 100644 --- a/Cura/gui/util/toolbarUtil.py +++ b/Cura/gui/util/toolbarUtil.py @@ -1,5 +1,4 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" -from __future__ import absolute_import from __future__ import division import wx diff --git a/Cura/gui/util/webcam.py b/Cura/gui/util/webcam.py index 7b007d9e..eb12ef79 100644 --- a/Cura/gui/util/webcam.py +++ b/Cura/gui/util/webcam.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/drawingLoader/drawing.py b/Cura/util/drawingLoader/drawing.py index 636559a7..68a952ed 100644 --- a/Cura/util/drawingLoader/drawing.py +++ b/Cura/util/drawingLoader/drawing.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/util/drawingLoader/dxf.py b/Cura/util/drawingLoader/dxf.py index eaa6e87b..8e2a789f 100644 --- a/Cura/util/drawingLoader/dxf.py +++ b/Cura/util/drawingLoader/dxf.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/util/drawingLoader/svg.py b/Cura/util/drawingLoader/svg.py index 430e4eb5..c9c91876 100644 --- a/Cura/util/drawingLoader/svg.py +++ b/Cura/util/drawingLoader/svg.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/util/explorer.py b/Cura/util/explorer.py index 3bc0819b..35991823 100644 --- a/Cura/util/explorer.py +++ b/Cura/util/explorer.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys diff --git a/Cura/util/gcodeGenerator.py b/Cura/util/gcodeGenerator.py index 0cd40418..2d32f31e 100644 --- a/Cura/util/gcodeGenerator.py +++ b/Cura/util/gcodeGenerator.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py index b86078cb..50b2be34 100644 --- a/Cura/util/gcodeInterpreter.py +++ b/Cura/util/gcodeInterpreter.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py index 7ac9333c..f04a21de 100644 --- a/Cura/util/machineCom.py +++ b/Cura/util/machineCom.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py index 220a590f..3532c778 100644 --- a/Cura/util/mesh.py +++ b/Cura/util/mesh.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import time diff --git a/Cura/util/meshLoader.py b/Cura/util/meshLoader.py index e85b9190..b37c66e8 100644 --- a/Cura/util/meshLoader.py +++ b/Cura/util/meshLoader.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/meshLoaders/amf.py b/Cura/util/meshLoaders/amf.py index f577c90a..0c63151b 100644 --- a/Cura/util/meshLoaders/amf.py +++ b/Cura/util/meshLoaders/amf.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import cStringIO as StringIO diff --git a/Cura/util/meshLoaders/dae.py b/Cura/util/meshLoaders/dae.py index 9e33c4da..8798859a 100644 --- a/Cura/util/meshLoaders/dae.py +++ b/Cura/util/meshLoaders/dae.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from xml.parsers.expat import ParserCreate diff --git a/Cura/util/meshLoaders/obj.py b/Cura/util/meshLoaders/obj.py index bb5ef292..c5a2be9f 100644 --- a/Cura/util/meshLoaders/obj.py +++ b/Cura/util/meshLoaders/obj.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/meshLoaders/stl.py b/Cura/util/meshLoaders/stl.py index 76c53b72..029a0b86 100644 --- a/Cura/util/meshLoaders/stl.py +++ b/Cura/util/meshLoaders/stl.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys diff --git a/Cura/util/profile.py b/Cura/util/profile.py index f53432de..8a764ac6 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import division __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" diff --git a/Cura/util/resources.py b/Cura/util/resources.py index 6eb90cc6..70ac64e5 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/util3d.py b/Cura/util/util3d.py index bb29d8a7..db52e791 100644 --- a/Cura/util/util3d.py +++ b/Cura/util/util3d.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math diff --git a/Cura/util/validators.py b/Cura/util/validators.py index d68aaf1d..f920aa97 100644 --- a/Cura/util/validators.py +++ b/Cura/util/validators.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import division __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" diff --git a/Cura/util/version.py b/Cura/util/version.py index 87a8b2df..2a34ac38 100644 --- a/Cura/util/version.py +++ b/Cura/util/version.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os diff --git a/Cura/util/youmagine.py b/Cura/util/youmagine.py index 85bbdb0f..6e77da7b 100644 --- a/Cura/util/youmagine.py +++ b/Cura/util/youmagine.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import json