[GRASS-SVN] r66416 - grass-addons/grass7/gui/wxpython/wx.mwprecip

[svn_grass at osgeo.org]

Author: krejcmat
Date: 2015-10-06 01:48:40 -0700 (Tue, 06 Oct 2015)
New Revision: 66416

Modified:
   grass-addons/grass7/gui/wxpython/wx.mwprecip/g.gui.mwprecip.py
   grass-addons/grass7/gui/wxpython/wx.mwprecip/mw3.py
   grass-addons/grass7/gui/wxpython/wx.mwprecip/mw_util.py
Log:
wx.mwprecip addons: fix import

Modified: grass-addons/grass7/gui/wxpython/wx.mwprecip/g.gui.mwprecip.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.mwprecip/g.gui.mwprecip.py	2015-10-06 08:32:43 UTC (rev 66415)
+++ grass-addons/grass7/gui/wxpython/wx.mwprecip/g.gui.mwprecip.py	2015-10-06 08:48:40 UTC (rev 66416)
@@ -1,28 +1,22 @@
 #!/usr/bin/env python
+VERSION = 1.0
 
+import grass.script as grass
+from mw_util        import *
+from mw3            import *
+import tempfile
 import os
 import sys
-from grass.pygrass.utils import get_lib_path
-import grass.script as grass
+import time
 
-
-VERSION = 1.0
-from grass.pygrass.utils import set_path
-set_path(modulename='wx.mwprecip', dirname='mw3')
-set_path(modulename='wx.mwprecip', dirname='mw_util')
-
-from mw_util import *
-from mw3 import *
-import tempfile
-
-from core.gcmd import GMessage, GError
-from gui_core import gselect
-from core.gthread import gThread
+from core.gcmd      import GMessage, GError
+from gui_core       import gselect
+from core.gthread   import gThread
 from gui_core.widgets import ColorTablesComboBox,PictureComboBox
-from core import globalvar
-import time
-from core.utils  import  GetColorTables
+from core           import globalvar
 
+from core.utils     import  GetColorTables
+
 class DBconn(wx.ScrolledWindow):
     def __init__(self, parent, settings={}):
         wx.ScrolledWindow.__init__(self, parent,  wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.VSCROLL)

Modified: grass-addons/grass7/gui/wxpython/wx.mwprecip/mw3.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.mwprecip/mw3.py	2015-10-06 08:32:43 UTC (rev 66415)
+++ grass-addons/grass7/gui/wxpython/wx.mwprecip/mw3.py	2015-10-06 08:48:40 UTC (rev 66416)
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8
-# __author__ = 'matt'
 
 from math import sin, cos, atan2, degrees, tan, sqrt
-import shutil
 from datetime import datetime
+import shutil
 import psycopg2
 import time
 import math
@@ -12,17 +11,11 @@
 import os
 from subprocess import PIPE
 
-from pgwrapper import pgwrapper as pg
-from core.gcmd import RunCommand
+from pgwrapper      import pgwrapper as pg
+from core.gcmd      import RunCommand
 from grass.pygrass.modules import Module
-
-import numpy as np
-
 import grass.script as grass
-from grass.pygrass.utils import set_path
-
-set_path(modulename='wx.mwprecip', dirname='mw_util')
-
+import numpy as np
 from mw_util import *
 
 class PointInterpolation():

Modified: grass-addons/grass7/gui/wxpython/wx.mwprecip/mw_util.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.mwprecip/mw_util.py	2015-10-06 08:32:43 UTC (rev 66415)
+++ grass-addons/grass7/gui/wxpython/wx.mwprecip/mw_util.py	2015-10-06 08:48:40 UTC (rev 66416)
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-__author__ = 'matt'
 import re
 import os
 import sys
@@ -10,8 +9,8 @@
 from datetime import timedelta
 import wx.lib.filebrowsebutton as filebrowse
 import codecs
-from core.gcmd import GMessage, GError
-from grass.script import core as grass
+from core.gcmd          import GMessage, GError
+from grass.script       import core as grass
 
 class SaveLoad(wx.Panel):
     def __init__(self, parent):