Thu May 21 18:04:15 EDT 2009

Author: martinl
Date: 2009-05-21 18:04:15 -0400 (Thu, 21 May 2009)
New Revision: 37347

Modified:
   grass/trunk/scripts/d.correlate/d.correlate.py
   grass/trunk/scripts/d.polar/d.polar.py
   grass/trunk/scripts/d.rast.edit/d.rast.edit.py
   grass/trunk/scripts/d.rast.leg/d.rast.leg.py
   grass/trunk/scripts/d.shadedmap/d.shadedmap.py
   grass/trunk/scripts/db.dropcol/db.dropcol.py
   grass/trunk/scripts/db.droptable/db.droptable.py
   grass/trunk/scripts/db.in.ogr/db.in.ogr.py
   grass/trunk/scripts/db.out.ogr/db.out.ogr.py
   grass/trunk/scripts/db.test/db.test.py
   grass/trunk/scripts/g.manual/g.manual.py
   grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py
   grass/trunk/scripts/i.image.mosaic/i.image.mosaic.py
   grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
   grass/trunk/scripts/i.landsat.rgb/i.landsat.rgb.py
   grass/trunk/scripts/i.oif/i.oif.py
   grass/trunk/scripts/i.spectral/i.spectral.py
   grass/trunk/scripts/i.tasscap/i.tasscap.py
   grass/trunk/scripts/m.proj/m.proj.py
   grass/trunk/scripts/r.blend/r.blend.py
   grass/trunk/scripts/r.buffer/r.buffer.py
   grass/trunk/scripts/r.fillnulls/r.fillnulls.py
   grass/trunk/scripts/r.grow/r.grow.py
   grass/trunk/scripts/r.in.aster/r.in.aster.py
   grass/trunk/scripts/r.in.srtm/r.in.srtm.py
   grass/trunk/scripts/r.in.wms/gdalwarp.py
   grass/trunk/scripts/r.in.wms/r.in.gdalwarp.py
   grass/trunk/scripts/r.in.wms/r.in.wms.py
   grass/trunk/scripts/r.in.wms/wms_download.py
   grass/trunk/scripts/r.in.wms/wms_request.py
   grass/trunk/scripts/r.mask/r.mask.py
   grass/trunk/scripts/r.out.xyz/r.out.xyz.py
   grass/trunk/scripts/r.plane/r.plane.py
   grass/trunk/scripts/r.reclass.area/r.reclass.area.py
   grass/trunk/scripts/r.regression.line/r.regression.line.py
   grass/trunk/scripts/r.rgb/r.rgb.py
   grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py
   grass/trunk/scripts/r.tileset/r.tileset.py
   grass/trunk/scripts/v.build.all/v.build.all.py
   grass/trunk/scripts/v.centroids/v.centroids.py
   grass/trunk/scripts/v.convert.all/v.convert.all.py
   grass/trunk/scripts/v.db.addcol/v.db.addcol.py
   grass/trunk/scripts/v.db.addtable/v.db.addtable.py
   grass/trunk/scripts/v.db.dropcol/v.db.dropcol.py
   grass/trunk/scripts/v.db.droptable/v.db.droptable.py
   grass/trunk/scripts/v.db.join/v.db.join.py
   grass/trunk/scripts/v.db.reconnect.all/v.db.reconnect.all.py
   grass/trunk/scripts/v.db.renamecol/v.db.renamecol.py
   grass/trunk/scripts/v.db.univar/v.db.univar.py
   grass/trunk/scripts/v.db.update/v.db.update.py
   grass/trunk/scripts/v.dissolve/v.dissolve.py
   grass/trunk/scripts/v.in.e00/v.in.e00.py
   grass/trunk/scripts/v.in.geonames/v.in.geonames.py
   grass/trunk/scripts/v.in.gns/v.in.gns.py
   grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py
   grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py
   grass/trunk/scripts/v.in.wfs/v.in.wfs.py
   grass/trunk/scripts/v.rast.stats/v.rast.stats.py
   grass/trunk/scripts/v.report/v.report.py
   grass/trunk/scripts/v.what.vect/v.what.vect.py
Log:
fix Python scripts, see r37345


Modified: grass/trunk/scripts/d.correlate/d.correlate.py
===================================================================

--- grass/trunk/scripts/d.correlate/d.correlate.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/d.correlate/d.correlate.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -31,7 +31,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     layers = options['layers'].split(',')

Modified: grass/trunk/scripts/d.polar/d.polar.py
===================================================================
--- grass/trunk/scripts/d.polar/d.polar.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/d.polar/d.polar.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -56,7 +56,7 @@
 import atexit
 import glob
 import shutil
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove(tmp)

Modified: grass/trunk/scripts/d.rast.edit/d.rast.edit.py
===================================================================
--- grass/trunk/scripts/d.rast.edit/d.rast.edit.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/d.rast.edit/d.rast.edit.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -93,7 +93,7 @@
 import sys
 import math
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 try:
     import wxversion

Modified: grass/trunk/scripts/d.rast.leg/d.rast.leg.py
===================================================================
--- grass/trunk/scripts/d.rast.leg/d.rast.leg.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/d.rast.leg/d.rast.leg.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -71,7 +71,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def make_frame(f, b, t, l, r):
     (ft, fb, fl, fr) = f

Modified: grass/trunk/scripts/d.shadedmap/d.shadedmap.py
===================================================================
--- grass/trunk/scripts/d.shadedmap/d.shadedmap.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/d.shadedmap/d.shadedmap.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -40,7 +40,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     drape_map = options['drapemap']

Modified: grass/trunk/scripts/db.dropcol/db.dropcol.py
===================================================================
--- grass/trunk/scripts/db.dropcol/db.dropcol.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/db.dropcol/db.dropcol.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -47,7 +47,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, db as grass
 
 def main():
     table = options['table']

Modified: grass/trunk/scripts/db.droptable/db.droptable.py
===================================================================
--- grass/trunk/scripts/db.droptable/db.droptable.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/db.droptable/db.droptable.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -36,7 +36,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db, vector as grass
 
 def main():
     table = options['table']

Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -52,7 +52,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     dsn = options['dsn']

Modified: grass/trunk/scripts/db.out.ogr/db.out.ogr.py
===================================================================
--- grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -55,7 +55,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     input = options['input']

Modified: grass/trunk/scripts/db.test/db.test.py
===================================================================
--- grass/trunk/scripts/db.test/db.test.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/db.test/db.test.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -27,7 +27,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     test_file = options['test']

Modified: grass/trunk/scripts/g.manual/g.manual.py
===================================================================
--- grass/trunk/scripts/g.manual/g.manual.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/g.manual/g.manual.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -35,7 +35,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def start_browser(entry):
     path = os.path.join(gisbase, 'docs', 'html', entry + '.html')

Modified: grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py
===================================================================
--- grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -84,7 +84,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 def main():
     global tmp

Modified: grass/trunk/scripts/i.image.mosaic/i.image.mosaic.py
===================================================================
--- grass/trunk/scripts/i.image.mosaic/i.image.mosaic.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.image.mosaic/i.image.mosaic.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -44,7 +44,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 def copy_colors(fh, map, offset):
     p = grass.pipe_command('r.colors.out', map = map)

Modified: grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
===================================================================
--- grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -55,7 +55,7 @@
 import sys
 import os
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 vrt = """<VRTDataset rasterXSize="$XSIZE" rasterYSize="$YSIZE">
  <SRS>GEOGCS[&quot;wgs84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;wgs84&quot;,6378137,298.257223563],TOWGS84[0.000,0.000,0.000]],PRIMEM[&quot;Greenwich&quot;,0],UNIT[&quot;degree&quot;,0.0174532925199433]]</SRS>

Modified: grass/trunk/scripts/i.landsat.rgb/i.landsat.rgb.py
===================================================================
--- grass/trunk/scripts/i.landsat.rgb/i.landsat.rgb.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.landsat.rgb/i.landsat.rgb.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -69,7 +69,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, raster as grass
 
 def get_percentile(map, percentile):
     s = grass.read_command('r.univar', flags = 'ge', map = map, percentile = percentile)

Modified: grass/trunk/scripts/i.oif/i.oif.py
===================================================================
--- grass/trunk/scripts/i.oif/i.oif.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.oif/i.oif.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -76,7 +76,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 bands = [1,2,3,4,5,7]
 

Modified: grass/trunk/scripts/i.spectral/i.spectral.py
===================================================================
--- grass/trunk/scripts/i.spectral/i.spectral.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.spectral/i.spectral.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -69,7 +69,7 @@
 import os
 import atexit
 import glob
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove('spectrum.gnuplot')

Modified: grass/trunk/scripts/i.tasscap/i.tasscap.py
===================================================================
--- grass/trunk/scripts/i.tasscap/i.tasscap.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/i.tasscap/i.tasscap.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -100,7 +100,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 parms = [[( 0.3037, 0.2793, 0.4743, 0.5585, 0.5082, 0.1863),
 	  (-0.2848,-0.2435,-0.5435, 0.7243, 0.0840,-0.1800),

Modified: grass/trunk/scripts/m.proj/m.proj.py
===================================================================
--- grass/trunk/scripts/m.proj/m.proj.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/m.proj/m.proj.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -89,7 +89,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     input = options['input']

Modified: grass/trunk/scripts/r.blend/r.blend.py
===================================================================
--- grass/trunk/scripts/r.blend/r.blend.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.blend/r.blend.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -53,7 +53,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, raster as grass
 
 def main():
     first = options['first']

Modified: grass/trunk/scripts/r.buffer/r.buffer.py
===================================================================
--- grass/trunk/scripts/r.buffer/r.buffer.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.buffer/r.buffer.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -61,7 +61,7 @@
 import os
 import atexit
 import math
-import grass
+from grass.script import core, raster as grass
 
 scales = {
     'meters': 1.0,

Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -56,7 +56,7 @@
 import sys
 import os
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 # what to do in case of user break:
 def cleanup():

Modified: grass/trunk/scripts/r.grow/r.grow.py
===================================================================
--- grass/trunk/scripts/r.grow/r.grow.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.grow/r.grow.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -76,7 +76,7 @@
 import os
 import atexit
 import math
-import grass
+from grass.script import core, raster as grass
 
 # what to do in case of user break:
 def cleanup():

Modified: grass/trunk/scripts/r.in.aster/r.in.aster.py
===================================================================
--- grass/trunk/scripts/r.in.aster/r.in.aster.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.aster/r.in.aster.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -61,7 +61,7 @@
 import sys
 import os
 import platform
-import grass
+from grass.script import core, raster as grass
 
 bands = {
     'L1A': {

Modified: grass/trunk/scripts/r.in.srtm/r.in.srtm.py
===================================================================
--- grass/trunk/scripts/r.in.srtm/r.in.srtm.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.srtm/r.in.srtm.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -112,7 +112,7 @@
 import os
 import shutil
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 def cleanup():
     if not in_temp:

Modified: grass/trunk/scripts/r.in.wms/gdalwarp.py
===================================================================
--- grass/trunk/scripts/r.in.wms/gdalwarp.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.wms/gdalwarp.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -23,7 +23,7 @@
 import os
 import subprocess
 
-import grass
+from grass.script import core as grass
 
 class GDALWarp:
     def __init__(self, flags, options):

Modified: grass/trunk/scripts/r.in.wms/r.in.gdalwarp.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.gdalwarp.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.wms/r.in.gdalwarp.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -77,7 +77,7 @@
 import sys
 import atexit
 
-import grass
+from grass.script import core as grass
 
 path = os.path.join(os.getenv('GISBASE'), 'etc', 'r.in.wms')
 sys.path.append(path)

Modified: grass/trunk/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.wms/r.in.wms.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -177,7 +177,7 @@
 import urllib
 import xml.sax
 
-import grass
+from grass.script import core, raster as grass
 
 wmsPath = os.path.join(os.getenv('GISBASE'), 'etc', 'r.in.wms')
 sys.path.append(wmsPath)

Modified: grass/trunk/scripts/r.in.wms/wms_download.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_download.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.wms/wms_download.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -19,7 +19,7 @@
 import os
 import urllib
 
-import grass
+from grass.script import core as grass
 
 class WMSDownload:
     def __init__(self, flags, options):

Modified: grass/trunk/scripts/r.in.wms/wms_request.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_request.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.in.wms/wms_request.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -18,7 +18,7 @@
 
 import os
 import glob
-import grass
+from grass.script import core as grass
 
 class WMSRequest:
     def __init__(self, flags, options):

Modified: grass/trunk/scripts/r.mask/r.mask.py
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.mask/r.mask.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -43,7 +43,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 import atexit
 
 def cleanup():

Modified: grass/trunk/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -46,7 +46,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     # if no output filename, output to stdout

Modified: grass/trunk/scripts/r.plane/r.plane.py
===================================================================
--- grass/trunk/scripts/r.plane/r.plane.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.plane/r.plane.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -73,7 +73,7 @@
 import os
 import math
 import string
-import grass
+from grass.script import core, raster as grass
 
 def main():
     name = options['name']

Modified: grass/trunk/scripts/r.reclass.area/r.reclass.area.py
===================================================================
--- grass/trunk/scripts/r.reclass.area/r.reclass.area.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -54,7 +54,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 def main():
     infile = options['input']

Modified: grass/trunk/scripts/r.regression.line/r.regression.line.py
===================================================================
--- grass/trunk/scripts/r.regression.line/r.regression.line.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.regression.line/r.regression.line.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -53,7 +53,7 @@
 import sys
 import os
 import math
-import grass
+from grass.script import core as grass
 
 def main():
     shell = flags['g']

Modified: grass/trunk/scripts/r.rgb/r.rgb.py
===================================================================
--- grass/trunk/scripts/r.rgb/r.rgb.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.rgb/r.rgb.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -34,7 +34,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, raster as grass
 
 def main():
     input = options['input']

Modified: grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py
===================================================================
--- grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -108,7 +108,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, raster as grass
 
 def main():
     input = options['input']

Modified: grass/trunk/scripts/r.tileset/r.tileset.py
===================================================================
--- grass/trunk/scripts/r.tileset/r.tileset.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/r.tileset/r.tileset.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -120,7 +120,7 @@
 import tempfile
 import math
 
-import grass
+from grass.script import core as grass
 
 def bboxToPoints(bbox):
     """Make points that are the corners of a bounding box"""

Modified: grass/trunk/scripts/v.build.all/v.build.all.py
===================================================================
--- grass/trunk/scripts/v.build.all/v.build.all.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.build.all/v.build.all.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -18,7 +18,7 @@
 #%End
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

Modified: grass/trunk/scripts/v.centroids/v.centroids.py
===================================================================
--- grass/trunk/scripts/v.centroids/v.centroids.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.centroids/v.centroids.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -71,7 +71,7 @@
 import sys
 import os
 import re
-import grass
+from grass.script import core, vector as grass
 
 def main():
     if options['option'] == 'add':

Modified: grass/trunk/scripts/v.convert.all/v.convert.all.py
===================================================================
--- grass/trunk/scripts/v.convert.all/v.convert.all.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.convert.all/v.convert.all.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -20,7 +20,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

Modified: grass/trunk/scripts/v.db.addcol/v.db.addcol.py
===================================================================
--- grass/trunk/scripts/v.db.addcol/v.db.addcol.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.addcol/v.db.addcol.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -47,7 +47,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.db.addtable/v.db.addtable.py
===================================================================
--- grass/trunk/scripts/v.db.addtable/v.db.addtable.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.addtable/v.db.addtable.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -51,7 +51,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db, vector as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.db.dropcol/v.db.dropcol.py
===================================================================
--- grass/trunk/scripts/v.db.dropcol/v.db.dropcol.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.dropcol/v.db.dropcol.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -50,7 +50,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, db as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.db.droptable/v.db.droptable.py
===================================================================
--- grass/trunk/scripts/v.db.droptable/v.db.droptable.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.droptable/v.db.droptable.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -46,7 +46,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     force = flags['f']

Modified: grass/trunk/scripts/v.db.join/v.db.join.py
===================================================================
--- grass/trunk/scripts/v.db.join/v.db.join.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.join/v.db.join.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -64,7 +64,7 @@
 import sys
 import os
 import string
-import grass
+from grass.script import core, db as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.db.reconnect.all/v.db.reconnect.all.py
===================================================================
--- grass/trunk/scripts/v.db.reconnect.all/v.db.reconnect.all.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.reconnect.all/v.db.reconnect.all.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -44,7 +44,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def main():
     old_database = options['old_database']

Modified: grass/trunk/scripts/v.db.renamecol/v.db.renamecol.py
===================================================================
--- grass/trunk/scripts/v.db.renamecol/v.db.renamecol.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.renamecol/v.db.renamecol.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -50,7 +50,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.db.univar/v.db.univar.py
===================================================================
--- grass/trunk/scripts/v.db.univar/v.db.univar.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.univar/v.db.univar.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -59,7 +59,7 @@
 import os
 import atexit
 import math
-import grass
+from grass.script import core as grass
 
 def cleanup():
     for ext in ['', '.sort']:

Modified: grass/trunk/scripts/v.db.update/v.db.update.py
===================================================================
--- grass/trunk/scripts/v.db.update/v.db.update.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.db.update/v.db.update.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -63,7 +63,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def main():
     map = options['map']

Modified: grass/trunk/scripts/v.dissolve/v.dissolve.py
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -54,7 +54,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 import atexit
 
 def cleanup():

Modified: grass/trunk/scripts/v.in.e00/v.in.e00.py
===================================================================
--- grass/trunk/scripts/v.in.e00/v.in.e00.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.e00/v.in.e00.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -55,7 +55,7 @@
 import os
 import shutil
 import glob
-import grass
+from grass.script import core as grass
 
 def main():
     filename = options['file']

Modified: grass/trunk/scripts/v.in.geonames/v.in.geonames.py
===================================================================
--- grass/trunk/scripts/v.in.geonames/v.in.geonames.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.geonames/v.in.geonames.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -45,7 +45,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     infile  = options['input']

Modified: grass/trunk/scripts/v.in.gns/v.in.gns.py
===================================================================
--- grass/trunk/scripts/v.in.gns/v.in.gns.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.gns/v.in.gns.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -45,7 +45,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     fileorig = options['file']

Modified: grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py
===================================================================
--- grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.mapgen/v.in.mapgen.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -58,7 +58,7 @@
 import string
 import time
 import shutil
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove(tmp)

Modified: grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py
===================================================================
--- grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.sites.all/v.in.sites.all.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -19,7 +19,7 @@
 #%End
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

Modified: grass/trunk/scripts/v.in.wfs/v.in.wfs.py
===================================================================
--- grass/trunk/scripts/v.in.wfs/v.in.wfs.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.in.wfs/v.in.wfs.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -34,7 +34,7 @@
 #%End
 
 import os
-import grass
+from grass.script import core as grass
 import urllib
 
 def main():

Modified: grass/trunk/scripts/v.rast.stats/v.rast.stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/v.rast.stats.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.rast.stats/v.rast.stats.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -68,7 +68,7 @@
 import sys
 import os
 import atexit
-import grass
+from grass.script import core, raster, vector as grass
 
 def has_column(vector, col):
     return 

Modified: grass/trunk/scripts/v.report/v.report.py
===================================================================
--- grass/trunk/scripts/v.report/v.report.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.report/v.report.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -56,7 +56,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def uniq(l):
     result = []

Modified: grass/trunk/scripts/v.what.vect/v.what.vect.py
===================================================================
--- grass/trunk/scripts/v.what.vect/v.what.vect.py	2009-05-21 21:20:54 UTC (rev 37346)
+++ grass/trunk/scripts/v.what.vect/v.what.vect.py	2009-05-21 22:04:15 UTC (rev 37347)
@@ -69,7 +69,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     grass.exec_command(

