[GRASS-SVN] r37558 - in grass/branches/releasebranch_6_4: gui/wxpython/gui_modules lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-28 04:08:29 -0400 (Thu, 28 May 2009)
New Revision: 37558

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
   grass/branches/releasebranch_6_4/lib/python/__init__.py
   grass/branches/releasebranch_6_4/lib/python/db.py
   grass/branches/releasebranch_6_4/lib/python/grasspythonlib.dox
   grass/branches/releasebranch_6_4/lib/python/raster.py
   grass/branches/releasebranch_6_4/lib/python/vector.py
Log:
import grass.script as grass


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/georect.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -35,7 +35,8 @@
 import wx.lib.colourselect as  csel
 import wx.wizard as wiz
 
-from grass.script import core, vector, db as grass
+import grass.script as grass
+
 import globalvar
 import mapdisp
 import render

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -26,7 +26,8 @@
 import wx
 import wx.combo
 
-from grass.script import core, vector as grass
+import grass.script as grass
+
 import globalvar
 import gcmd
 import utils

Modified: grass/branches/releasebranch_6_4/lib/python/__init__.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/__init__.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/lib/python/__init__.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -1,4 +1,5 @@
-import core
-import db
-import raster
-import vector
+from core   import *
+from db     import *
+from raster import *
+from vector import *
+

Modified: grass/branches/releasebranch_6_4/lib/python/db.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/db.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/lib/python/db.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -8,7 +8,7 @@
 Usage:
 
 @code
-from grass.script import core, db as grass
+from grass.script import db as grass
 
 grass.parser()
 grass.db_describe(table)

Modified: grass/branches/releasebranch_6_4/lib/python/grasspythonlib.dox
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/grasspythonlib.dox	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/lib/python/grasspythonlib.dox	2009-05-28 08:08:29 UTC (rev 37558)
@@ -30,13 +30,13 @@
 Usage:
 
 \code
-from grass.script import core[,db[,raster,[vector]]] as grass
+import grass.script as grass
 \endcode
 
-e.g. to import functions from "core" and "vector" modules use
+or just import selected module, e.g.
 
 \code
-from grass.script import core, vector as grass
+from grass.script import core as grass
 \endcode
 
 Sample script
@@ -58,7 +58,7 @@
 #%end
 
 import sys
-from grass.script import core as grass
+import grass.script as grass
 
 def main():
     info = grass.parse_command('v.info',

Modified: grass/branches/releasebranch_6_4/lib/python/raster.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/raster.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/lib/python/raster.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -8,7 +8,7 @@
 Usage:
 
 @code
-from grass.script import core, raster as grass
+from grass.script import raster as grass
 
 grass.parser()
 grass.raster_history(map)

Modified: grass/branches/releasebranch_6_4/lib/python/vector.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/vector.py	2009-05-28 07:59:31 UTC (rev 37557)
+++ grass/branches/releasebranch_6_4/lib/python/vector.py	2009-05-28 08:08:29 UTC (rev 37558)
@@ -8,7 +8,7 @@
 Usage:
 
 @code
-from grass.script import core, vector as grass
+from grass.script import vector as grass
 
 grass.parser()
 grass.vector_db(map)