瀏覽代碼

Manually revert https://trac.osgeo.org/grass/changeset/57904, https://trac.osgeo.org/grass/changeset/60569

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60591 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 11 年之前
父節點
當前提交
f9421783a4
共有 1 個文件被更改,包括 2 次插入9 次删除
  1. 2 9
      scripts/r.out.xyz/r.out.xyz.py

+ 2 - 9
scripts/r.out.xyz/r.out.xyz.py

@@ -31,7 +31,6 @@
 #% required: no
 #%end
 #%option G_OPT_F_SEP
-#% answer: space
 #%end
 
 import sys
@@ -41,18 +40,12 @@ from grass.script import core as grass
 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)