[GRASS-SVN] r63256 - in grass/branches/releasebranch_7_0: . lib/python/temporal scripts/i.pansharpen scripts/v.out.gps

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-28 08:05:28 -0800 (Fri, 28 Nov 2014)
New Revision: 63256

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
   grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py
Log:
fix renamed options in scripts (#2409)
    (merge r63255 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
 63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
 63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py	2014-11-28 16:04:18 UTC (rev 63255)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/stds_export.py	2014-11-28 16:05:28 UTC (rev 63256)
@@ -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/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py	2014-11-28 16:04:18 UTC (rev 63255)
+++ grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py	2014-11-28 16:05:28 UTC (rev 63256)
@@ -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>>
@@ -212,7 +212,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/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py	2014-11-28 16:04:18 UTC (rev 63255)
+++ grass/branches/releasebranch_7_0/scripts/v.out.gps/v.out.gps.py	2014-11-28 16:05:28 UTC (rev 63256)
@@ -279,7 +279,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: