[GRASS-SVN] r60591 - grass/trunk/scripts/r.out.xyz

[svn_grass at osgeo.org]

Author: glynn
Date: 2014-05-29 16:27:47 -0700 (Thu, 29 May 2014)
New Revision: 60591

Modified:
   grass/trunk/scripts/r.out.xyz/r.out.xyz.py
Log:
Manually revert r57904, r60569


Modified: grass/trunk/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2014-05-29 22:23:24 UTC (rev 60590)
+++ grass/trunk/scripts/r.out.xyz/r.out.xyz.py	2014-05-29 23:27:47 UTC (rev 60591)
@@ -31,7 +31,6 @@
 #% required: no
 #%end
 #%option G_OPT_F_SEP
-#% answer: space
 #%end
 
 import sys
@@ -41,18 +40,12 @@
 def main():
     # if no output filename, output to stdout
     output = options['output']
-    sep = options['separator']
 
     parameters = dict(flags="1gn",
-                      input=options['input'])
+                      input=options['input'],
+                      separator=options['separator'])
     if output:
         parameters.update(output=output)
-    # windows don't like pipe so we don't include it in the command explicitly
-    if sep == '|':
-        grass.warning(_("Separator '|' is not allowed. Using a space."))
-        # but why?
-    else:
-        parameters.update(separator=sep)
 
     ret = grass.run_command("r.stats", **parameters)
     sys.exit(ret)