Rename printrun.printrun_utils to printrun.utils

printrun/excluder.py

@@ -16,7 +16,7 @@
 import wx
 from printrun import gviz
 
-from printrun_utils import imagefile, install_locale
+from .utils import imagefile, install_locale
 install_locale('pronterface')
 
 class ExcluderWindow(gviz.GvizWindow):

printrun/gcodeplater.py

@@ -17,7 +17,7 @@
 
 # Set up Internationalization using gettext
 # searching for installed locales on /usr/share; uses relative folder if not found (windows)
-from printrun.printrun_utils import install_locale, get_home_pos
+from .utils import install_locale, get_home_pos
 install_locale('pronterface')
 
 import wx

printrun/gcoder.py

@@ -21,7 +21,7 @@ import datetime
 import logging
 from array import array
 
-from printrun_utils import install_locale
+from .utils import install_locale
 install_locale('pronterface')
 
 gcode_parsed_args = ["x", "y", "e", "f", "z", "i", "j"]

printrun/gcview.py

@@ -30,7 +30,7 @@ from pyglet.gl import *
 
 from .gviz import GvizBaseFrame
 
-from printrun_utils import imagefile, install_locale, get_home_pos
+from .utils import imagefile, install_locale, get_home_pos
 install_locale('pronterface')
 
 def create_model(light):

printrun/gl/libtatlin/actors.py

@@ -33,7 +33,7 @@ from pyglet.gl import glPushMatrix, glPopMatrix, glTranslatef, \
     glEnableClientState, glDisableClientState, GL_VERTEX_ARRAY, GL_COLOR_ARRAY
 from pyglet.graphics.vertexbuffer import create_buffer, VertexBufferObject
 
-from printrun.printrun_utils import install_locale
+from printrun.utils import install_locale
 install_locale('pronterface')
 
 def vec(*args):

printrun/graph.py

@@ -18,7 +18,7 @@
 import wx
 from math import log10, floor, ceil
 
-from printrun.printrun_utils import install_locale
+from .utils import install_locale
 install_locale('pronterface')
 
 from bufferedcanvas import BufferedCanvas

printrun/gui/__init__.py

@@ -19,7 +19,7 @@ except:
     print _("WX is not installed. This program requires WX to run.")
     raise
 
-from printrun.printrun_utils import install_locale
+from printrun.utils import install_locale
 install_locale('pronterface')
 
 from .controls import ControlsSizer, add_extra_controls

printrun/gviz.py

@@ -19,7 +19,7 @@ import wx
 import time
 from printrun import gcoder
 
-from printrun_utils import imagefile, install_locale, get_home_pos
+from .utils import imagefile, install_locale, get_home_pos
 install_locale('pronterface')
 
 class GvizBaseFrame(wx.Frame):

printrun/objectplater.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
 
-from printrun.printrun_utils import install_locale, iconfile
+from .utils import install_locale, iconfile
 install_locale('plater')
 
 import os

printrun/plater.py

@@ -19,7 +19,7 @@ import os
 
 # Set up Internationalization using gettext
 # searching for installed locales on /usr/share; uses relative folder if not found (windows)
-from printrun.printrun_utils import install_locale
+from .utils import install_locale
 install_locale('pronterface')
 
 import wx

printrun/printcore.py

@@ -34,7 +34,7 @@ import re
 from functools import wraps
 from collections import deque
 from printrun import gcoder
-from printrun.printrun_utils import install_locale, decode_utf8, setup_logging
+from .utils import install_locale, decode_utf8, setup_logging
 install_locale('pronterface')
 
 setup_logging(sys.stderr)

printrun/pronsole.py

@@ -29,7 +29,7 @@ import traceback
 import re
 
 from . import printcore
-from printrun.printrun_utils import install_locale, run_command, \
+from .utils import install_locale, run_command, \
     format_time, format_duration, RemainingTimeEstimator, \
     get_home_pos, parse_build_dimensions, parse_temperature_report
 install_locale('pronterface')

printrun/pronterface.py

@@ -34,7 +34,8 @@ except ImportError: import json
 from . import pronsole
 from . import printcore
 
-from printrun.printrun_utils import install_locale, setup_logging, \
+from .utils import install_locale, setup_logging, \
+    iconfile, configfile, format_time, format_duration, \
     hexcolor_to_float, parse_temperature_report
 install_locale('pronterface')
 
@@ -53,7 +54,6 @@ layerindex = 0
 if os.name == "nt":
     winsize = (800, 530)
 
-from printrun.printrun_utils import iconfile, configfile, format_time, format_duration
 from printrun.gui import MainWindow
 from printrun.excluder import Excluder
 from pronsole import dosify, wxSetting, HiddenSetting, StringSetting, SpinSetting, FloatSpinSetting, BooleanSetting, StaticTextSetting

printrun/xybuttons.py

@@ -16,7 +16,7 @@
 import wx
 import math
 from bufferedcanvas import BufferedCanvas
-from printrun_utils import imagefile
+from .utils import imagefile
 
 def sign(n):
     if n < 0: return -1

printrun/zbuttons.py

@@ -15,7 +15,7 @@
 
 import wx
 from bufferedcanvas import BufferedCanvas
-from printrun_utils import imagefile
+from .utils import imagefile
 
 def sign(n):
     if n < 0: return -1