[GRASS-SVN] r37555 - grass/branches/develbranch_6/lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-28 03:45:50 -0400 (Thu, 28 May 2009)
New Revision: 37555

Removed:
   grass/branches/develbranch_6/lib/python/all.py
Modified:
   grass/branches/develbranch_6/lib/python/Makefile
   grass/branches/develbranch_6/lib/python/__init__.py
   grass/branches/develbranch_6/lib/python/grasspythonlib.dox
Log:
grass.script.all replaced by __init__.py
		 (merge from trunk, r37554)


Modified: grass/branches/develbranch_6/lib/python/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/python/Makefile	2009-05-28 07:40:10 UTC (rev 37554)
+++ grass/branches/develbranch_6/lib/python/Makefile	2009-05-28 07:45:50 UTC (rev 37555)
@@ -9,7 +9,7 @@
 GDIR = $(PYDIR)/grass
 DSTDIR = $(GDIR)/script
 
-MODULES = core db raster vector all
+MODULES = core db raster vector
 
 PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
 

Modified: grass/branches/develbranch_6/lib/python/__init__.py
===================================================================
--- grass/branches/develbranch_6/lib/python/__init__.py	2009-05-28 07:40:10 UTC (rev 37554)
+++ grass/branches/develbranch_6/lib/python/__init__.py	2009-05-28 07:45:50 UTC (rev 37555)
@@ -1,5 +1,5 @@
-import core
-import db
-import raster
-import vector
-import all
+from core   import *
+from db     import *
+from raster import *
+from vector import *
+

Deleted: grass/branches/develbranch_6/lib/python/all.py
===================================================================
--- grass/branches/develbranch_6/lib/python/all.py	2009-05-28 07:40:10 UTC (rev 37554)
+++ grass/branches/develbranch_6/lib/python/all.py	2009-05-28 07:45:50 UTC (rev 37555)
@@ -1,4 +0,0 @@
-from core   import *
-from db     import *
-from raster import *
-from vector import *

Modified: grass/branches/develbranch_6/lib/python/grasspythonlib.dox
===================================================================
--- grass/branches/develbranch_6/lib/python/grasspythonlib.dox	2009-05-28 07:40:10 UTC (rev 37554)
+++ grass/branches/develbranch_6/lib/python/grasspythonlib.dox	2009-05-28 07:45:50 UTC (rev 37555)
@@ -30,7 +30,7 @@
 Usage:
 
 \code
-from grass.script import all as grass
+import grass.script as grass
 \endcode
 
 or just import selected module, e.g.
@@ -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',