From: daid303 Date: Fri, 17 May 2013 08:51:17 +0000 (+0200) Subject: Copyright message needs to be after the __future__ imports. X-Git-Tag: 13.05~3 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e657375e4ee87dfbf732bc7fc8c2e5f2959a07d5;p=cura.git Copyright message needs to be after the __future__ imports. --- diff --git a/Cura/cura.py b/Cura/cura.py index c208d3d6..6ea2989a 100644 --- a/Cura/cura.py +++ b/Cura/cura.py @@ -1,5 +1,4 @@ #!/usr/bin/python -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" """ This page is in the table of contents. ==Overview== @@ -8,6 +7,7 @@ Cura is a AGPL tool chain to generate a GCode path for 3D printing. Older versio 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/alterationPanel.py b/Cura/gui/alterationPanel.py index e57efbda..4ccf12ab 100644 --- a/Cura/gui/alterationPanel.py +++ b/Cura/gui/alterationPanel.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 2174c230..048d03d3 100644 --- a/Cura/gui/app.py +++ b/Cura/gui/app.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys import os diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index ad7d030e..77c5c866 100644 --- a/Cura/gui/configBase.py +++ b/Cura/gui/configBase.py @@ -1,6 +1,6 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import from __future__ import division +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import platform import wx, wx.lib.stattext, types diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index fcf29ca9..80ce9f0d 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import webbrowser import threading diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py index 303c94d6..624be954 100644 --- a/Cura/gui/expertConfig.py +++ b/Cura/gui/expertConfig.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 b0a7eb08..c64fcf6d 100644 --- a/Cura/gui/firmwareInstall.py +++ b/Cura/gui/firmwareInstall.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os, wx, threading, sys diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 91ca427a..d6005c3c 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import os diff --git a/Cura/gui/pluginPanel.py b/Cura/gui/pluginPanel.py index 8a6f42a9..83a50d68 100644 --- a/Cura/gui/pluginPanel.py +++ b/Cura/gui/pluginPanel.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import webbrowser diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index c9041dbd..97ec3542 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 c2a8c97d..2441da32 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import threading import re diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 874a3c72..b060e7c0 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import numpy diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index 9a296e4d..e2f5a2b0 100644 --- a/Cura/gui/simpleMode.py +++ b/Cura/gui/simpleMode.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 83f83003..d3aa4f6d 100644 --- a/Cura/gui/splashScreen.py +++ b/Cura/gui/splashScreen.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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/minecraftImport.py b/Cura/gui/tools/minecraftImport.py index fba4d061..21c8583c 100644 --- a/Cura/gui/tools/minecraftImport.py +++ b/Cura/gui/tools/minecraftImport.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import glob diff --git a/Cura/gui/tools/superformula.py b/Cura/gui/tools/superformula.py index db701927..f7fd1c41 100644 --- a/Cura/gui/tools/superformula.py +++ b/Cura/gui/tools/superformula.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import math diff --git a/Cura/gui/util/dropTarget.py b/Cura/gui/util/dropTarget.py index 41541e93..38481136 100644 --- a/Cura/gui/util/dropTarget.py +++ b/Cura/gui/util/dropTarget.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 f4b82cc4..484af664 100644 --- a/Cura/gui/util/gcodeTextArea.py +++ b/Cura/gui/util/gcodeTextArea.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import wx.stc diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py index 80ffa9d0..d5df4eab 100644 --- a/Cura/gui/util/opengl.py +++ b/Cura/gui/util/opengl.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math import numpy diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py index bde32ff6..8a388c00 100644 --- a/Cura/gui/util/openglGui.py +++ b/Cura/gui/util/openglGui.py @@ -1,6 +1,6 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import from __future__ import division +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import wx import traceback diff --git a/Cura/gui/util/previewTools.py b/Cura/gui/util/previewTools.py index c7f737c2..cd94ded0 100644 --- a/Cura/gui/util/previewTools.py +++ b/Cura/gui/util/previewTools.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math import wx diff --git a/Cura/gui/util/taskbar.py b/Cura/gui/util/taskbar.py index dd675585..533eff24 100644 --- a/Cura/gui/util/taskbar.py +++ b/Cura/gui/util/taskbar.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" try: import comtypes.client as cc diff --git a/Cura/gui/util/webcam.py b/Cura/gui/util/webcam.py index 98280c64..2d309640 100644 --- a/Cura/gui/util/webcam.py +++ b/Cura/gui/util/webcam.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os import glob diff --git a/Cura/util/explorer.py b/Cura/util/explorer.py index 01f0faae..3bc0819b 100644 --- a/Cura/util/explorer.py +++ b/Cura/util/explorer.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys import os diff --git a/Cura/util/gcodeGenerator.py b/Cura/util/gcodeGenerator.py index 665f8376..0cd40418 100644 --- a/Cura/util/gcodeGenerator.py +++ b/Cura/util/gcodeGenerator.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 0f7b147e..2403f2c9 100644 --- a/Cura/util/gcodeInterpreter.py +++ b/Cura/util/gcodeInterpreter.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys import math diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py index 25e9e824..aae99eb2 100644 --- a/Cura/util/machineCom.py +++ b/Cura/util/machineCom.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os import glob diff --git a/Cura/util/mesh.py b/Cura/util/mesh.py index a473f3ed..3262b328 100644 --- a/Cura/util/mesh.py +++ b/Cura/util/mesh.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import time import math diff --git a/Cura/util/meshLoader.py b/Cura/util/meshLoader.py index bbc51367..ff550b83 100644 --- a/Cura/util/meshLoader.py +++ b/Cura/util/meshLoader.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from Cura.util.meshLoaders import stl from Cura.util.meshLoaders import obj diff --git a/Cura/util/meshLoaders/amf.py b/Cura/util/meshLoaders/amf.py index 5dbd6177..b131eb14 100644 --- a/Cura/util/meshLoaders/amf.py +++ b/Cura/util/meshLoaders/amf.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import cStringIO as StringIO import zipfile diff --git a/Cura/util/meshLoaders/dae.py b/Cura/util/meshLoaders/dae.py index 084e81e3..e448fdeb 100644 --- a/Cura/util/meshLoaders/dae.py +++ b/Cura/util/meshLoaders/dae.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 ef84b513..6ce4f319 100644 --- a/Cura/util/meshLoaders/obj.py +++ b/Cura/util/meshLoaders/obj.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from Cura.util import mesh diff --git a/Cura/util/meshLoaders/stl.py b/Cura/util/meshLoaders/stl.py index 92904f38..4ebfcf27 100644 --- a/Cura/util/meshLoaders/stl.py +++ b/Cura/util/meshLoaders/stl.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import sys import os diff --git a/Cura/util/profile.py b/Cura/util/profile.py index f9e3f251..51ea91ee 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -1,6 +1,6 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import from __future__ import division +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os, traceback, math, re, zlib, base64, time, sys, platform, glob, string, stat, types import cPickle as pickle diff --git a/Cura/util/resources.py b/Cura/util/resources.py index c918dedd..1dad2ade 100644 --- a/Cura/util/resources.py +++ b/Cura/util/resources.py @@ -1,5 +1,6 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" + import os import sys diff --git a/Cura/util/settings.py b/Cura/util/settings.py deleted file mode 100644 index 0f123836..00000000 --- a/Cura/util/settings.py +++ /dev/null @@ -1,7 +0,0 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" - -class setting(object): - def __init__(self, key, name, description): - self._key = key - self._name = name - self._description = description diff --git a/Cura/util/svg.py b/Cura/util/svg.py index c583c137..195db236 100644 --- a/Cura/util/svg.py +++ b/Cura/util/svg.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import math from xml.etree import ElementTree diff --git a/Cura/util/util3d.py b/Cura/util/util3d.py index fa5311f3..bb29d8a7 100644 --- a/Cura/util/util3d.py +++ b/Cura/util/util3d.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" 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 e93e8569..90145010 100644 --- a/Cura/util/validators.py +++ b/Cura/util/validators.py @@ -1,6 +1,6 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import from __future__ import division +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import types import math diff --git a/Cura/util/version.py b/Cura/util/version.py index aa50c552..fe3a9cd5 100644 --- a/Cura/util/version.py +++ b/Cura/util/version.py @@ -1,5 +1,5 @@ -__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" from __future__ import absolute_import +__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" import os import sys