[GRASS-SVN] r53265 - in grass/trunk: general/g.mapsets scripts/r.out.xyz scripts/r3.in.xyz

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-09-21 15:52:38 -0700 (Fri, 21 Sep 2012)
New Revision: 53265

Modified:
   grass/trunk/general/g.mapsets/g.mapsets_picker.py
   grass/trunk/scripts/r.out.xyz/r.out.xyz.py
   grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
Log:
turek: separator fix (bug #1741)

Modified: grass/trunk/general/g.mapsets/g.mapsets_picker.py
===================================================================
--- grass/trunk/general/g.mapsets/g.mapsets_picker.py	2012-09-21 16:01:39 UTC (rev 53264)
+++ grass/trunk/general/g.mapsets/g.mapsets_picker.py	2012-09-21 22:52:38 UTC (rev 53265)
@@ -107,7 +107,7 @@
         ret = grass.read_command('g.mapsets',
                                  quiet = True,
                                  flags = 'l',
-                                 fs = 'newline')
+                                 sep = 'newline')
         self.mapsets = []
         if ret:
             self.mapsets = ret.splitlines()
@@ -116,7 +116,7 @@
         ret = grass.read_command('g.mapsets',
                                  quiet = True,
                                  flags = 'p',
-                                 fs = 'newline')
+                                 sep = 'newline')
         mapsets_access = []
         if ret:
             mapsets_access = ret.splitlines()

Modified: grass/trunk/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2012-09-21 16:01:39 UTC (rev 53264)
+++ grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2012-09-21 22:52:38 UTC (rev 53265)
@@ -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'], fs = options['sep'], output = output)
+    ret = grass.run_command("r.stats", flags = "1gn", input = options['input'], sep = options['sep'], output = output)
     sys.exit(ret)
 
 if __name__ == "__main__":

Modified: grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
===================================================================
--- grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2012-09-21 16:01:39 UTC (rev 53264)
+++ grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py	2012-09-21 22:52:38 UTC (rev 53265)
@@ -233,7 +233,7 @@
 	else:
 	    doShell = ''
         grass.run_command('r.in.xyz', flags = 's' + doShell, input = infile,
-			  output = 'dummy', fs = fs, x = x, y = y, z = z,
+			  output = 'dummy', sep = fs, x = x, y = y, z = z,
 			  **addl_opts)
 	sys.exit()
 
@@ -285,7 +285,7 @@
 		        % (i, region['depths'], zrange_min, zrange_max))
 
 	proc[i] = grass.start_command('r.in.xyz', input = infile, output = tmp_layer_name,
-				      fs = fs, method = method, x = x, y = y, z = z,
+				      sep = fs, method = method, x = x, y = y, z = z,
 				      percent = percent, type = data_type,
 				      zrange = '%.15g,%.15g' % (zrange_min, zrange_max),
 				      **addl_opts)
@@ -312,7 +312,7 @@
     grass.verbose(_("Assembling 3D cube ..."))
 
     #input order: lower most strata first
-    slices = grass.read_command('g.mlist', type = 'rast', fs = ',',
+    slices = grass.read_command('g.mlist', type = 'rast', sep = ',',
 				pattern = 'tmp.r3xyz.%d.*' % os.getpid()).rstrip('\n')
     grass.debug(slices)