From: Ilya Kulakov Date: Fri, 7 Dec 2012 08:29:41 +0000 (+0700) Subject: Fix power import. X-Git-Tag: 13.03~168^2^2~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=40e86b2883139bb3de3ca97ae551c1f51483c0c0;p=cura.git Fix power import. --- diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 3a57bb45..e79d5c2e 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -7,6 +7,7 @@ import subprocess import sys import time import platform +import power import wx from wx.lib import buttons @@ -15,7 +16,6 @@ from Cura.gui.util import webcam from Cura.gui.util 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/util/__init__.py b/Cura/util/__init__.py index c343c1b4..bf893c06 100644 --- a/Cura/util/__init__.py +++ b/Cura/util/__init__.py @@ -1,7 +1 @@ -import sys -import os - - -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Power')) - -import power +# coding=utf-8 \ No newline at end of file