[GRASS-SVN] r56913 - in grass/branches/develbranch_6: gui/wxpython/scripts scripts/v.krige

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-24 18:20:03 -0700 (Mon, 24 Jun 2013)
New Revision: 56913

Modified:
   grass/branches/develbranch_6/gui/wxpython/scripts/vkrige.py
   grass/branches/develbranch_6/scripts/v.krige/v.krige.py
Log:
update to modern python module names

Modified: grass/branches/develbranch_6/gui/wxpython/scripts/vkrige.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/scripts/vkrige.py	2013-06-24 23:50:18 UTC (rev 56912)
+++ grass/branches/develbranch_6/gui/wxpython/scripts/vkrige.py	2013-06-25 01:20:03 UTC (rev 56913)
@@ -33,14 +33,14 @@
     sys.exit(_("No GRASS-python library found."))
 ### wxGUI imports
 
-GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules")
+GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_core")
 sys.path.append(GUIModulesPath)
 
 import globalvar
 import gselect
 import goutput
-import menuform
-from preferences import globalSettings as UserSettings
+import forms
+from settings import UserSettings
 #import help
 
 import wx
@@ -101,7 +101,7 @@
         for Rpackage in ["gstat"]: # , "geoR"]: #@TODO: enable it if/when it'll be implemented.
             self.CreatePage(package = Rpackage, Rinstance = Rinstance, controller = controller)
         
-        ## Command output. From menuform module, cmdPanel class
+        ## Command output. From forms.py module, cmdPanel class
         self.goutput = goutput.GMConsole(parent = self, margin = False,
                                          notebook = self.RPackagesBook)
         self.goutputId = self.RPackagesBook.GetPageCount()

Modified: grass/branches/develbranch_6/scripts/v.krige/v.krige.py
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2013-06-24 23:50:18 UTC (rev 56912)
+++ grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2013-06-25 01:20:03 UTC (rev 56913)
@@ -108,7 +108,7 @@
     print "You must be in GRASS GIS to run this program."
     sys.exit(1)
 
-GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "modules")
+GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "core")
 sys.path.append(GUIModulesPath)
 
 GUIPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "scripts")