[GRASS-SVN] r37548 - in grass/trunk: gui/wxpython/gui_modules
scripts/d.rast.edit scripts/d.rast.leg scripts/db.dropcol
scripts/db.droptable scripts/db.in.ogr
scripts/i.fusion.brovey scripts/i.image.mosaic
scripts/i.in.spotvgt scripts/i.landsat.rgb scripts/i.tasscap
scripts/r.blend scripts/r.buffer scripts/r.fillnulls
scripts/r.grow scripts/r.in.aster scripts/r.in.srtm
scripts/r.in.wms scripts/r.mask scripts/r.plane
scripts/r.reclass.area scripts/r.rgb scripts/r.shaded.relief
scripts/v.centroids scripts/v.db.addcol scripts/v.db.addtable
scripts/v.db.dropcol scripts/v.db.join
scripts/v.db.reconnect.all scripts/v.db.renamecol
scripts/v.db.update scripts/v.in.geonames
scripts/v.rast.stats scripts/v.report
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed May 27 17:37:33 EDT 2009
Author: martinl
Date: 2009-05-27 17:37:33 -0400 (Wed, 27 May 2009)
New Revision: 37548
Modified:
grass/trunk/gui/wxpython/gui_modules/georect.py
grass/trunk/gui/wxpython/gui_modules/gselect.py
grass/trunk/scripts/d.rast.edit/d.rast.edit.py
grass/trunk/scripts/d.rast.leg/d.rast.leg.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/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.tasscap/i.tasscap.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/r.in.wms.py
grass/trunk/scripts/r.mask/r.mask.py
grass/trunk/scripts/r.plane/r.plane.py
grass/trunk/scripts/r.reclass.area/r.reclass.area.py
grass/trunk/scripts/r.rgb/r.rgb.py
grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py
grass/trunk/scripts/v.centroids/v.centroids.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.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.update/v.db.update.py
grass/trunk/scripts/v.in.geonames/v.in.geonames.py
grass/trunk/scripts/v.rast.stats/v.rast.stats.py
grass/trunk/scripts/v.report/v.report.py
Log:
import all from grass.script
Modified: grass/trunk/gui/wxpython/gui_modules/georect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/georect.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/gui/wxpython/gui_modules/georect.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -35,7 +35,7 @@
import wx.lib.colourselect as csel
import wx.wizard as wiz
-from grass.script import core, db, vector as grass
+from grass.script import all as grass
import globalvar
import mapdisp
Modified: grass/trunk/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gselect.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/gui/wxpython/gui_modules/gselect.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -26,7 +26,7 @@
import wx
import wx.combo
-from grass.script import core, db, vector as grass
+from grass.script import all as grass
import globalvar
import gcmd
Modified: grass/trunk/scripts/d.rast.edit/d.rast.edit.py
===================================================================
--- grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -93,7 +93,7 @@
import sys
import math
import atexit
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/d.rast.leg/d.rast.leg.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -71,7 +71,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all as grass
def make_frame(f, b, t, l, r):
(ft, fb, fl, fr) = f
Modified: grass/trunk/scripts/db.dropcol/db.dropcol.py
===================================================================
--- grass/trunk/scripts/db.dropcol/db.dropcol.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/db.dropcol/db.dropcol.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -47,7 +47,7 @@
import sys
import os
import string
-from grass.script import core, db as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/db.droptable/db.droptable.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -36,7 +36,7 @@
import sys
import os
-from grass.script import core, db, vector as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -52,7 +52,7 @@
import sys
import os
-from grass.script import core, db as grass
+from grass.script import all as grass
def main():
dsn = options['dsn']
Modified: grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py
===================================================================
--- grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/i.fusion.brovey/i.fusion.brovey.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -84,7 +84,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/i.image.mosaic/i.image.mosaic.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -44,7 +44,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -55,7 +55,7 @@
import sys
import os
import atexit
-from grass.script import core, raster as grass
+from grass.script import all as grass
vrt = """<VRTDataset rasterXSize="$XSIZE" rasterYSize="$YSIZE">
<SRS>GEOGCS["wgs84",DATUM["WGS_1984",SPHEROID["wgs84",6378137,298.257223563],TOWGS84[0.000,0.000,0.000]],PRIMEM["Greenwich",0],UNIT["degree",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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/i.landsat.rgb/i.landsat.rgb.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -69,7 +69,7 @@
import sys
import os
import string
-from grass.script import core, raster as grass
+from grass.script import all as grass
def get_percentile(map, percentile):
s = grass.read_command('r.univar', flags = 'ge', map = map, percentile = percentile)
Modified: grass/trunk/scripts/i.tasscap/i.tasscap.py
===================================================================
--- grass/trunk/scripts/i.tasscap/i.tasscap.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/i.tasscap/i.tasscap.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -100,7 +100,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all 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/r.blend/r.blend.py
===================================================================
--- grass/trunk/scripts/r.blend/r.blend.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.blend/r.blend.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -53,7 +53,7 @@
import sys
import os
import string
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.buffer/r.buffer.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -61,7 +61,7 @@
import os
import atexit
import math
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -56,7 +56,7 @@
import sys
import os
import atexit
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.grow/r.grow.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -76,7 +76,7 @@
import os
import atexit
import math
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.in.aster/r.in.aster.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -61,7 +61,7 @@
import sys
import os
import platform
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.in.srtm/r.in.srtm.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -112,7 +112,7 @@
import os
import shutil
import atexit
-from grass.script import core, raster as grass
+from grass.script import all as grass
def cleanup():
if not in_temp:
Modified: grass/trunk/scripts/r.in.wms/r.in.wms.py
===================================================================
--- grass/trunk/scripts/r.in.wms/r.in.wms.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.in.wms/r.in.wms.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -177,7 +177,7 @@
import urllib
import xml.sax
-from grass.script import core, raster as grass
+from grass.script import all as grass
wmsPath = os.path.join(os.getenv('GISBASE'), 'etc', 'r.in.wms')
sys.path.append(wmsPath)
Modified: grass/trunk/scripts/r.mask/r.mask.py
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.mask/r.mask.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -43,7 +43,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all as grass
import atexit
def cleanup():
Modified: grass/trunk/scripts/r.plane/r.plane.py
===================================================================
--- grass/trunk/scripts/r.plane/r.plane.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.plane/r.plane.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -73,7 +73,7 @@
import os
import math
import string
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -54,7 +54,7 @@
import sys
import os
-from grass.script import core, raster as grass
+from grass.script import all as grass
def main():
infile = options['input']
Modified: grass/trunk/scripts/r.rgb/r.rgb.py
===================================================================
--- grass/trunk/scripts/r.rgb/r.rgb.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.rgb/r.rgb.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -34,7 +34,7 @@
import sys
import os
import string
-from grass.script import core, raster as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/r.shaded.relief/r.shaded.relief.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -108,7 +108,7 @@
import sys
import os
import string
-from grass.script import core, raster as grass
+from grass.script import all as grass
def main():
input = options['input']
Modified: grass/trunk/scripts/v.centroids/v.centroids.py
===================================================================
--- grass/trunk/scripts/v.centroids/v.centroids.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.centroids/v.centroids.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -71,7 +71,7 @@
import sys
import os
import re
-from grass.script import core, vector as grass
+from grass.script import all as grass
def main():
if options['option'] == 'add':
Modified: grass/trunk/scripts/v.db.addcol/v.db.addcol.py
===================================================================
--- grass/trunk/scripts/v.db.addcol/v.db.addcol.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.addcol/v.db.addcol.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -47,7 +47,7 @@
import sys
import os
-from grass.script import core, vector as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.addtable/v.db.addtable.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -51,7 +51,7 @@
import sys
import os
-from grass.script import core, db, vector as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.dropcol/v.db.dropcol.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -50,7 +50,7 @@
import sys
import os
import string
-from grass.script import core, db as grass
+from grass.script import all as grass
def main():
map = options['map']
Modified: grass/trunk/scripts/v.db.join/v.db.join.py
===================================================================
--- grass/trunk/scripts/v.db.join/v.db.join.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.join/v.db.join.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -64,7 +64,7 @@
import sys
import os
import string
-from grass.script import core, db as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.reconnect.all/v.db.reconnect.all.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -44,7 +44,7 @@
import sys
import os
-from grass.script import core, vector as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.renamecol/v.db.renamecol.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -50,7 +50,7 @@
import sys
import os
-from grass.script import core, db as grass
+from grass.script import all as grass
def main():
map = options['map']
Modified: grass/trunk/scripts/v.db.update/v.db.update.py
===================================================================
--- grass/trunk/scripts/v.db.update/v.db.update.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.db.update/v.db.update.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -63,7 +63,7 @@
import sys
import os
-from grass.script import core, vector as grass
+from grass.script import all as grass
def main():
map = options['map']
Modified: grass/trunk/scripts/v.in.geonames/v.in.geonames.py
===================================================================
--- grass/trunk/scripts/v.in.geonames/v.in.geonames.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.in.geonames/v.in.geonames.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -45,7 +45,7 @@
import sys
import os
-from grass.script import core, db as grass
+from grass.script import all as grass
def main():
infile = options['input']
Modified: grass/trunk/scripts/v.rast.stats/v.rast.stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2009-05-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -68,7 +68,7 @@
import sys
import os
import atexit
-from grass.script import core, raster, vector as grass
+from grass.script import all 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-27 21:28:37 UTC (rev 37547)
+++ grass/trunk/scripts/v.report/v.report.py 2009-05-27 21:37:33 UTC (rev 37548)
@@ -56,7 +56,7 @@
import sys
import os
-from grass.script import core, vector as grass
+from grass.script import all as grass
def uniq(l):
result = []
More information about the grass-commit
mailing list