Bladeren bron

fix Python scripts, see https://trac.osgeo.org/grass/changeset/37345

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37347 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 jaren geleden
bovenliggende
commit
57c41c9622
60 gewijzigde bestanden met toevoegingen van 60 en 60 verwijderingen
  1. 1 1
      scripts/d.correlate/d.correlate.py
  2. 1 1
      scripts/d.polar/d.polar.py
  3. 1 1
      scripts/d.rast.edit/d.rast.edit.py
  4. 1 1
      scripts/d.rast.leg/d.rast.leg.py
  5. 1 1
      scripts/d.shadedmap/d.shadedmap.py
  6. 1 1
      scripts/db.dropcol/db.dropcol.py
  7. 1 1
      scripts/db.droptable/db.droptable.py
  8. 1 1
      scripts/db.in.ogr/db.in.ogr.py
  9. 1 1
      scripts/db.out.ogr/db.out.ogr.py
  10. 1 1
      scripts/db.test/db.test.py
  11. 1 1
      scripts/g.manual/g.manual.py
  12. 1 1
      scripts/i.fusion.brovey/i.fusion.brovey.py
  13. 1 1
      scripts/i.image.mosaic/i.image.mosaic.py
  14. 1 1
      scripts/i.in.spotvgt/i.in.spotvgt.py
  15. 1 1
      scripts/i.landsat.rgb/i.landsat.rgb.py
  16. 1 1
      scripts/i.oif/i.oif.py
  17. 1 1
      scripts/i.spectral/i.spectral.py
  18. 1 1
      scripts/i.tasscap/i.tasscap.py
  19. 1 1
      scripts/m.proj/m.proj.py
  20. 1 1
      scripts/r.blend/r.blend.py
  21. 1 1
      scripts/r.buffer/r.buffer.py
  22. 1 1
      scripts/r.fillnulls/r.fillnulls.py
  23. 1 1
      scripts/r.grow/r.grow.py
  24. 1 1
      scripts/r.in.aster/r.in.aster.py
  25. 1 1
      scripts/r.in.srtm/r.in.srtm.py
  26. 1 1
      scripts/r.in.wms/gdalwarp.py
  27. 1 1
      scripts/r.in.wms/r.in.gdalwarp.py
  28. 1 1
      scripts/r.in.wms/r.in.wms.py
  29. 1 1
      scripts/r.in.wms/wms_download.py
  30. 1 1
      scripts/r.in.wms/wms_request.py
  31. 1 1
      scripts/r.mask/r.mask.py
  32. 1 1
      scripts/r.out.xyz/r.out.xyz.py
  33. 1 1
      scripts/r.plane/r.plane.py
  34. 1 1
      scripts/r.reclass.area/r.reclass.area.py
  35. 1 1
      scripts/r.regression.line/r.regression.line.py
  36. 1 1
      scripts/r.rgb/r.rgb.py
  37. 1 1
      scripts/r.shaded.relief/r.shaded.relief.py
  38. 1 1
      scripts/r.tileset/r.tileset.py
  39. 1 1
      scripts/v.build.all/v.build.all.py
  40. 1 1
      scripts/v.centroids/v.centroids.py
  41. 1 1
      scripts/v.convert.all/v.convert.all.py
  42. 1 1
      scripts/v.db.addcol/v.db.addcol.py
  43. 1 1
      scripts/v.db.addtable/v.db.addtable.py
  44. 1 1
      scripts/v.db.dropcol/v.db.dropcol.py
  45. 1 1
      scripts/v.db.droptable/v.db.droptable.py
  46. 1 1
      scripts/v.db.join/v.db.join.py
  47. 1 1
      scripts/v.db.reconnect.all/v.db.reconnect.all.py
  48. 1 1
      scripts/v.db.renamecol/v.db.renamecol.py
  49. 1 1
      scripts/v.db.univar/v.db.univar.py
  50. 1 1
      scripts/v.db.update/v.db.update.py
  51. 1 1
      scripts/v.dissolve/v.dissolve.py
  52. 1 1
      scripts/v.in.e00/v.in.e00.py
  53. 1 1
      scripts/v.in.geonames/v.in.geonames.py
  54. 1 1
      scripts/v.in.gns/v.in.gns.py
  55. 1 1
      scripts/v.in.mapgen/v.in.mapgen.py
  56. 1 1
      scripts/v.in.sites.all/v.in.sites.all.py
  57. 1 1
      scripts/v.in.wfs/v.in.wfs.py
  58. 1 1
      scripts/v.rast.stats/v.rast.stats.py
  59. 1 1
      scripts/v.report/v.report.py
  60. 1 1
      scripts/v.what.vect/v.what.vect.py

+ 1 - 1
scripts/d.correlate/d.correlate.py

@@ -31,7 +31,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     layers = options['layers'].split(',')

+ 1 - 1
scripts/d.polar/d.polar.py

@@ -56,7 +56,7 @@ import math
 import atexit
 import glob
 import shutil
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove(tmp)

+ 1 - 1
scripts/d.rast.edit/d.rast.edit.py

@@ -93,7 +93,7 @@
 import sys
 import math
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 try:
     import wxversion

+ 1 - 1
scripts/d.rast.leg/d.rast.leg.py

@@ -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

+ 1 - 1
scripts/d.shadedmap/d.shadedmap.py

@@ -40,7 +40,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     drape_map = options['drapemap']

+ 1 - 1
scripts/db.dropcol/db.dropcol.py

@@ -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']

+ 1 - 1
scripts/db.droptable/db.droptable.py

@@ -36,7 +36,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db, vector as grass
 
 def main():
     table = options['table']

+ 1 - 1
scripts/db.in.ogr/db.in.ogr.py

@@ -52,7 +52,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     dsn = options['dsn']

+ 1 - 1
scripts/db.out.ogr/db.out.ogr.py

@@ -55,7 +55,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     input = options['input']

+ 1 - 1
scripts/db.test/db.test.py

@@ -27,7 +27,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     test_file = options['test']

+ 1 - 1
scripts/g.manual/g.manual.py

@@ -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')

+ 1 - 1
scripts/i.fusion.brovey/i.fusion.brovey.py

@@ -84,7 +84,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 def main():
     global tmp

+ 1 - 1
scripts/i.image.mosaic/i.image.mosaic.py

@@ -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)

+ 1 - 1
scripts/i.in.spotvgt/i.in.spotvgt.py

@@ -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>

+ 1 - 1
scripts/i.landsat.rgb/i.landsat.rgb.py

@@ -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)

+ 1 - 1
scripts/i.oif/i.oif.py

@@ -76,7 +76,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 bands = [1,2,3,4,5,7]
 

+ 1 - 1
scripts/i.spectral/i.spectral.py

@@ -69,7 +69,7 @@ import sys
 import os
 import atexit
 import glob
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove('spectrum.gnuplot')

+ 1 - 1
scripts/i.tasscap/i.tasscap.py

@@ -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),

+ 1 - 1
scripts/m.proj/m.proj.py

@@ -89,7 +89,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     input = options['input']

+ 1 - 1
scripts/r.blend/r.blend.py

@@ -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']

+ 1 - 1
scripts/r.buffer/r.buffer.py

@@ -61,7 +61,7 @@ import sys
 import os
 import atexit
 import math
-import grass
+from grass.script import core, raster as grass
 
 scales = {
     'meters': 1.0,

+ 1 - 1
scripts/r.fillnulls/r.fillnulls.py

@@ -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():

+ 1 - 1
scripts/r.grow/r.grow.py

@@ -76,7 +76,7 @@ import sys
 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():

+ 1 - 1
scripts/r.in.aster/r.in.aster.py

@@ -61,7 +61,7 @@
 import sys
 import os
 import platform
-import grass
+from grass.script import core, raster as grass
 
 bands = {
     'L1A': {

+ 1 - 1
scripts/r.in.srtm/r.in.srtm.py

@@ -112,7 +112,7 @@ import sys
 import os
 import shutil
 import atexit
-import grass
+from grass.script import core, raster as grass
 
 def cleanup():
     if not in_temp:

+ 1 - 1
scripts/r.in.wms/gdalwarp.py

@@ -23,7 +23,7 @@
 import os
 import subprocess
 
-import grass
+from grass.script import core as grass
 
 class GDALWarp:
     def __init__(self, flags, options):

+ 1 - 1
scripts/r.in.wms/r.in.gdalwarp.py

@@ -77,7 +77,7 @@ import os
 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)

+ 1 - 1
scripts/r.in.wms/r.in.wms.py

@@ -177,7 +177,7 @@ import tempfile
 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)

+ 1 - 1
scripts/r.in.wms/wms_download.py

@@ -19,7 +19,7 @@
 import os
 import urllib
 
-import grass
+from grass.script import core as grass
 
 class WMSDownload:
     def __init__(self, flags, options):

+ 1 - 1
scripts/r.in.wms/wms_request.py

@@ -18,7 +18,7 @@
 
 import os
 import glob
-import grass
+from grass.script import core as grass
 
 class WMSRequest:
     def __init__(self, flags, options):

+ 1 - 1
scripts/r.mask/r.mask.py

@@ -43,7 +43,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 import atexit
 
 def cleanup():

+ 1 - 1
scripts/r.out.xyz/r.out.xyz.py

@@ -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

+ 1 - 1
scripts/r.plane/r.plane.py

@@ -73,7 +73,7 @@ import sys
 import os
 import math
 import string
-import grass
+from grass.script import core, raster as grass
 
 def main():
     name = options['name']

+ 1 - 1
scripts/r.reclass.area/r.reclass.area.py

@@ -54,7 +54,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, raster as grass
 
 def main():
     infile = options['input']

+ 1 - 1
scripts/r.regression.line/r.regression.line.py

@@ -53,7 +53,7 @@
 import sys
 import os
 import math
-import grass
+from grass.script import core as grass
 
 def main():
     shell = flags['g']

+ 1 - 1
scripts/r.rgb/r.rgb.py

@@ -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']

+ 1 - 1
scripts/r.shaded.relief/r.shaded.relief.py

@@ -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']

+ 1 - 1
scripts/r.tileset/r.tileset.py

@@ -120,7 +120,7 @@ import subprocess
 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"""

+ 1 - 1
scripts/v.build.all/v.build.all.py

@@ -18,7 +18,7 @@
 #%End
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

+ 1 - 1
scripts/v.centroids/v.centroids.py

@@ -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':

+ 1 - 1
scripts/v.convert.all/v.convert.all.py

@@ -20,7 +20,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

+ 1 - 1
scripts/v.db.addcol/v.db.addcol.py

@@ -47,7 +47,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def main():
     map = options['map']

+ 1 - 1
scripts/v.db.addtable/v.db.addtable.py

@@ -51,7 +51,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db, vector as grass
 
 def main():
     map = options['map']

+ 1 - 1
scripts/v.db.dropcol/v.db.dropcol.py

@@ -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']

+ 1 - 1
scripts/v.db.droptable/v.db.droptable.py

@@ -46,7 +46,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     force = flags['f']

+ 1 - 1
scripts/v.db.join/v.db.join.py

@@ -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']

+ 1 - 1
scripts/v.db.reconnect.all/v.db.reconnect.all.py

@@ -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']

+ 1 - 1
scripts/v.db.renamecol/v.db.renamecol.py

@@ -50,7 +50,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     map = options['map']

+ 1 - 1
scripts/v.db.univar/v.db.univar.py

@@ -59,7 +59,7 @@ import sys
 import os
 import atexit
 import math
-import grass
+from grass.script import core as grass
 
 def cleanup():
     for ext in ['', '.sort']:

+ 1 - 1
scripts/v.db.update/v.db.update.py

@@ -63,7 +63,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def main():
     map = options['map']

+ 1 - 1
scripts/v.dissolve/v.dissolve.py

@@ -54,7 +54,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 import atexit
 
 def cleanup():

+ 1 - 1
scripts/v.in.e00/v.in.e00.py

@@ -55,7 +55,7 @@ import sys
 import os
 import shutil
 import glob
-import grass
+from grass.script import core as grass
 
 def main():
     filename = options['file']

+ 1 - 1
scripts/v.in.geonames/v.in.geonames.py

@@ -45,7 +45,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, db as grass
 
 def main():
     infile  = options['input']

+ 1 - 1
scripts/v.in.gns/v.in.gns.py

@@ -45,7 +45,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core as grass
 
 def main():
     fileorig = options['file']

+ 1 - 1
scripts/v.in.mapgen/v.in.mapgen.py

@@ -58,7 +58,7 @@ import atexit
 import string
 import time
 import shutil
-import grass
+from grass.script import core as grass
 
 def cleanup():
     grass.try_remove(tmp)

+ 1 - 1
scripts/v.in.sites.all/v.in.sites.all.py

@@ -19,7 +19,7 @@
 #%End
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     env = grass.gisenv()

+ 1 - 1
scripts/v.in.wfs/v.in.wfs.py

@@ -34,7 +34,7 @@
 #%End
 
 import os
-import grass
+from grass.script import core as grass
 import urllib
 
 def main():

+ 1 - 1
scripts/v.rast.stats/v.rast.stats.py

@@ -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 

+ 1 - 1
scripts/v.report/v.report.py

@@ -56,7 +56,7 @@
 
 import sys
 import os
-import grass
+from grass.script import core, vector as grass
 
 def uniq(l):
     result = []

+ 1 - 1
scripts/v.what.vect/v.what.vect.py

@@ -69,7 +69,7 @@
 #%end
 
 import sys
-import grass
+from grass.script import core as grass
 
 def main():
     grass.exec_command(