[GRASS-SVN] r61207 - grass/branches/releasebranch_7_0/lib/python/script
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jul 9 00:50:29 PDT 2014
Author: hellik
Date: 2014-07-09 00:50:29 -0700 (Wed, 09 Jul 2014)
New Revision: 61207
Modified:
grass/branches/releasebranch_7_0/lib/python/script/raster.py
Log:
Pass r.mapcalc expressions via stdin rather than expression= (merged from trunk: r60662)
Modified: grass/branches/releasebranch_7_0/lib/python/script/raster.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/raster.py 2014-07-09 03:09:44 UTC (rev 61206)
+++ grass/branches/releasebranch_7_0/lib/python/script/raster.py 2014-07-09 07:50:29 UTC (rev 61207)
@@ -98,10 +98,10 @@
t = string.Template(exp)
e = t.substitute(**kwargs)
- if run_command('r.mapcalc', expression = e,
- quiet = quiet,
- verbose = verbose,
- overwrite = overwrite) != 0:
+ if write_command('r.mapcalc', file = '-', stdin = e,
+ quiet = quiet,
+ verbose = verbose,
+ overwrite = overwrite) != 0:
fatal(_("An error occurred while running r.mapcalc"))
@@ -131,10 +131,13 @@
t = string.Template(exp)
e = t.substitute(**kwargs)
- return start_command('r.mapcalc', expression = e,
- quiet = quiet,
- verbose = verbose,
- overwrite = overwrite)
+ p = feed_command('r.mapcalc', file = '-',
+ quiet = quiet,
+ verbose = verbose,
+ overwrite = overwrite)
+ p.stdin.write(e)
+ p.stdin.close()
+ return p
# interface to r.what
def raster_what(map, coord):
More information about the grass-commit
mailing list