From: daid303 Date: Thu, 6 Dec 2012 13:57:00 +0000 (+0100) Subject: Quick and ugly change which fixes slicing with pypy. Cleanup will follow. X-Git-Tag: 13.03~172 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=df2bd314b55f808e330d360b83fc8f81fb689651;p=cura.git Quick and ugly change which fixes slicing with pypy. Cleanup will follow. --- diff --git a/Cura/cura.py b/Cura/cura.py index abc2163d..fae6d8bb 100644 --- a/Cura/cura.py +++ b/Cura/cura.py @@ -14,8 +14,6 @@ import sys import warnings from optparse import OptionParser -import wx._core - from Cura.util import profile __author__ = 'Daid' @@ -46,13 +44,6 @@ Art of Illusion """ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' -class CuraApp(wx.App): - def MacOpenFile(self, path): - try: - pass - except Exception as e: - warnings.warn("File at {p} cannot be read: {e}".format(p=path, e=str(e))) - def main(): parser = OptionParser(usage="usage: %prog [options] .stl") parser.add_option("-i", "--ini", action="store", type="string", dest="profileini", @@ -90,8 +81,16 @@ def main(): if len(args) > 0: profile.putPreference('lastFile', ';'.join(args)) + import wx._core from Cura.gui import splashScreen + class CuraApp(wx.App): + def MacOpenFile(self, path): + try: + pass + except Exception as e: + warnings.warn("File at {p} cannot be read: {e}".format(p=path, e=str(e))) + def mainWindowRunCallback(splash): from Cura.gui import mainWindow if splash is not None: