[GRASS-SVN] r63255 - in grass/trunk: lib/python/temporal raster/r.in.poly/testsuite scripts/i.pansharpen scripts/v.out.gps

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-28 08:04:18 -0800 (Fri, 28 Nov 2014)
New Revision: 63255

Modified:
   grass/trunk/lib/python/temporal/stds_export.py
   grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
   grass/trunk/scripts/i.pansharpen/i.pansharpen.py
   grass/trunk/scripts/v.out.gps/v.out.gps.py
Log:
fix renamed options in scripts (#2409)


Modified: grass/trunk/lib/python/temporal/stds_export.py
===================================================================
--- grass/trunk/lib/python/temporal/stds_export.py	2014-11-28 16:00:15 UTC (rev 63254)
+++ grass/trunk/lib/python/temporal/stds_export.py	2014-11-28 16:04:18 UTC (rev 63255)
@@ -154,7 +154,7 @@
         list_file.write(string)
         # Export the vector map with v.out.ogr
         try:
-            gscript.run_command("v.out.ogr", input=name, dsn=(name + ".xml"),
+            gscript.run_command("v.out.ogr", input=name, output=(name + ".xml"),
                                 layer=layer, format="GML")
         except CalledModuleError:
             shutil.rmtree(new_cwd)

Modified: grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py
===================================================================
--- grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2014-11-28 16:00:15 UTC (rev 63254)
+++ grass/trunk/raster/r.in.poly/testsuite/test_rinpoly.py	2014-11-28 16:04:18 UTC (rev 63255)
@@ -102,7 +102,7 @@
         self.tmpFile.write(input1)
         self.tmpFile.close()
         self.assertModule('r.in.poly', input=self.tmpFile.name, output=self.rinpoly, type='DCELL')
-        category = read_command('r.category', map=self.rinpoly, vals=[-8, 3, 10.01]).strip()
+        category = read_command('r.category', map=self.rinpoly, values=[-8, 3, 10.01]).strip()
         self.assertEqual(first="-8\t\n3\tlabel2\n10.01\tlabel1", second=category,
                          msg="Labels do not match")
 

Modified: grass/trunk/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/trunk/scripts/i.pansharpen/i.pansharpen.py	2014-11-28 16:00:15 UTC (rev 63254)
+++ grass/trunk/scripts/i.pansharpen/i.pansharpen.py	2014-11-28 16:04:18 UTC (rev 63255)
@@ -2,7 +2,7 @@
 
 ############################################################################
 #
-# MODULE:	    i.pansharpen
+# MODULE:	    i.panmethod
 #
 # AUTHOR(S):    Overall script by Michael Barton (ASU)	
 #               Brovey transformation in i.fusion.brovey by Markus Neteler <<neteler at osgeo org>>
@@ -214,7 +214,7 @@
         grass.message(_("Creating PCA images and calculating eigenvectors..."))
 
         #initial PCA with RGB channels
-        pca_out = grass.read_command('i.pca', quiet=True, rescale='0,0', input='%s,%s,%s' % (ms1, ms2, ms3), output_prefix='tmp%s.pca' % pid)
+        pca_out = grass.read_command('i.pca', quiet=True, rescale='0,0', input='%s,%s,%s' % (ms1, ms2, ms3), output='tmp%s.pca' % pid)
         if len(pca_out) < 1:
             grass.fatal(_("Input has no data. Check region settings."))
 

Modified: grass/trunk/scripts/v.out.gps/v.out.gps.py
===================================================================
--- grass/trunk/scripts/v.out.gps/v.out.gps.py	2014-11-28 16:00:15 UTC (rev 63254)
+++ grass/trunk/scripts/v.out.gps/v.out.gps.py	2014-11-28 16:04:18 UTC (rev 63255)
@@ -281,7 +281,7 @@
 
     tmp_gpx = tmp + ".gpx"
     try:
-        grass.run_command('v.out.ogr', input=tmp_vogb, dsn=tmp_gpx,
+        grass.run_command('v.out.ogr', input=tmp_vogb, output=tmp_gpx,
                           type=type, format='GPX', lco=linetype,
                           dsco="GPX_USE_EXTENSIONS=YES", quiet=True)
     except CalledModuleError: