[GRASS-SVN] r37473 - grass/branches/releasebranch_6_4/gui/scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-25 10:53:03 -0400 (Mon, 25 May 2009)
New Revision: 37473

Modified:
   grass/branches/releasebranch_6_4/gui/scripts/g.change.gui.py
   grass/branches/releasebranch_6_4/gui/scripts/v.type_wrapper.py
Log:
import grass.script instead of grass
       (merge from devbr6, r37471)


Modified: grass/branches/releasebranch_6_4/gui/scripts/g.change.gui.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/g.change.gui.py	2009-05-25 14:47:32 UTC (rev 37472)
+++ grass/branches/releasebranch_6_4/gui/scripts/g.change.gui.py	2009-05-25 14:53:03 UTC (rev 37473)
@@ -35,12 +35,13 @@
 
 # simple front end to g.gui to be used from within the GUI.
 
-import grass
 import sys
+from grass.script import core as grass
 
 def main():
     grass.exec_command("g.gui", flags = 'nu', gui = options['gui'])
-    sys.exit(ret)
+    
+    return 0
 
 if __name__ == "__main__":
     options, flags = grass.parser()

Modified: grass/branches/releasebranch_6_4/gui/scripts/v.type_wrapper.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/v.type_wrapper.py	2009-05-25 14:47:32 UTC (rev 37472)
+++ grass/branches/releasebranch_6_4/gui/scripts/v.type_wrapper.py	2009-05-25 14:53:03 UTC (rev 37473)
@@ -52,8 +52,8 @@
 #% answer: boundary to line
 #%end
 
-import grass
 import sys
+from grass.script import core as grass
 
 def main():
     if options['type'] == "point to centroid":