[GRASS-SVN] r53329 - in grass/trunk/scripts: m.proj r.out.xyz r.tileset r3.in.xyz v.in.lines

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-07 03:06:34 -0700 (Sun, 07 Oct 2012)
New Revision: 53329

Modified:
   grass/trunk/scripts/m.proj/m.proj.py
   grass/trunk/scripts/r.out.xyz/r.out.xyz.py
   grass/trunk/scripts/r.tileset/r.tileset.py
   grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
   grass/trunk/scripts/v.in.lines/v.in.lines.py
Log:
Keys in `options` dictionary cannot be shortened. Patch provided by Stepan Turek.


Modified: grass/trunk/scripts/m.proj/m.proj.py
===================================================================
--- grass/trunk/scripts/m.proj/m.proj.py	2012-10-06 22:14:49 UTC (rev 53328)
+++ grass/trunk/scripts/m.proj/m.proj.py	2012-10-07 10:06:34 UTC (rev 53329)
@@ -112,7 +112,7 @@
 def main():
     input = options['input']
     output = options['output']
-    fs = options['sep']
+    fs = options['separator']
     proj_in = options['proj_input']
     proj_out = options['proj_output']
     ll_in = flags['i']

Modified: grass/trunk/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2012-10-06 22:14:49 UTC (rev 53328)
+++ grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2012-10-07 10:06:34 UTC (rev 53329)
@@ -37,7 +37,7 @@
     # if no output filename, output to stdout
     output = options['output']
 
-    ret = grass.run_command("r.stats", flags = "1gn", input = options['input'], sep = options['sep'], output = output)
+    ret = grass.run_command("r.stats", flags = "1gn", input = options['input'], sep = options['separator'], output = output)
     sys.exit(ret)
 
 if __name__ == "__main__":

Modified: grass/trunk/scripts/r.tileset/r.tileset.py
===================================================================
--- grass/trunk/scripts/r.tileset/r.tileset.py	2012-10-06 22:14:49 UTC (rev 53328)
+++ grass/trunk/scripts/r.tileset/r.tileset.py	2012-10-07 10:06:34 UTC (rev 53329)
@@ -372,7 +372,7 @@
                           (tile_bbox['w'], tile_bbox['s'], tile_bbox['e'], tile_bbox['n'],
                            tile_size_overlap[0], tile_size_overlap[1])
                 else:
-                    fs = options['sep']
+                    fs = options['separator']
                     print "%s%s%s%s%s%s%s%s%s%s%s" % \
                           (tile_bbox['w'], fs, tile_bbox['s'], fs, tile_bbox['e'], fs, tile_bbox['n'], fs,
                            tile_size_overlap[0], fs, tile_size_overlap[1])

Modified: grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
===================================================================
--- grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2012-10-06 22:14:49 UTC (rev 53328)
+++ grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2012-10-07 10:06:34 UTC (rev 53329)
@@ -190,7 +190,7 @@
     output = options['output']
     method = options['method']
     dtype = options['type']
-    fs = options['sep']
+    fs = options['separator']
     x = options['x']
     y = options['y']
     z = options['z']

Modified: grass/trunk/scripts/v.in.lines/v.in.lines.py
===================================================================
--- grass/trunk/scripts/v.in.lines/v.in.lines.py	2012-10-06 22:14:49 UTC (rev 53328)
+++ grass/trunk/scripts/v.in.lines/v.in.lines.py	2012-10-07 10:06:34 UTC (rev 53329)
@@ -44,7 +44,7 @@
 def main():
     global tmp
 
-    fs = options['sep']
+    fs = options['separator']
     threeD = flags['z']
 
     prog = 'v.in.lines'