[GRASS-SVN] r62421 - in grass/trunk: general/g.remove gui/wxpython/gmodeler gui/wxpython/iclass gui/wxpython/iscatt gui/wxpython/lmgr gui/wxpython/mapdisp gui/wxpython/rlisetup gui/wxpython/vnet lib/gpde/test lib/python/gunittest lib/python/gunittest/testsuite lib/python/pygrass lib/python/pygrass/modules/grid lib/python/pygrass/raster/testsuite lib/python/pygrass/vector/testsuite lib/python/script lib/python/temporal lib/python/temporal/testsuite raster/r.category raster/r.li/r.li.setup raster/r.mapcalc/testsuite raster/r.slope.aspect/testsuite raster/r.viewshed/testsuite raster/r.watershed/front raster/simwe/r.sim.water raster3d/r3.flow/testsuite raster3d/r3.gradient/testsuite raster3d/r3.out.netcdf/test_suite scripts/d.rast.edit scripts/d.shadedmap scripts/db.in.ogr scripts/i.in.spotvgt scripts/i.pansharpen scripts/r.buffer.lowmem scripts/r.colors.stddev scripts/r.fillnulls scripts/r.grow scripts/r.in.wms scripts/r.mask scripts/r.reclass.area scripts/r.unpack/test_suite scrip ts/v.dissolve scripts/v.out.gps scripts/v.rast.stats scripts/v.to.lines scripts/v.unpack scripts/v.unpack/test_suite temporal/t.merge/testsuite temporal/t.rast.accdetect temporal/t.rast.accumulate temporal/t.rast.gapfill temporal/t.rast.import temporal/t.rast.mapcalc temporal/t.rast.neighbors temporal/t.rast.out.vtk temporal/t.rast.series temporal/t.rast.to.rast3 temporal/t.register temporal/t.remove temporal/t.rename temporal/t.support temporal/t.vect.db.select temporal/t.vect.extract temporal/t.vect.import/testsuite temporal/t.vect.list/testsuite temporal/t.vect.observe.strds/testsuite temporal/t.vect.univar/testsuite temporal/t.vect.what.strds testsuite/raster tools vector/v.distance vector/v.lrs/v.lrs.create vector/v.what/testsuite
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Oct 27 10:10:47 PDT 2014
Author: hcho
Date: 2014-10-27 10:10:46 -0700 (Mon, 27 Oct 2014)
New Revision: 62421
Modified:
grass/trunk/general/g.remove/g.remove.html
grass/trunk/gui/wxpython/gmodeler/frame.py
grass/trunk/gui/wxpython/gmodeler/model.py
grass/trunk/gui/wxpython/iclass/frame.py
grass/trunk/gui/wxpython/iscatt/iscatt_core.py
grass/trunk/gui/wxpython/lmgr/datacatalog.py
grass/trunk/gui/wxpython/mapdisp/frame.py
grass/trunk/gui/wxpython/rlisetup/functions.py
grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
grass/trunk/gui/wxpython/vnet/vnet_core.py
grass/trunk/gui/wxpython/vnet/vnet_data.py
grass/trunk/lib/gpde/test/test_arrays.c
grass/trunk/lib/python/gunittest/case.py
grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py
grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py
grass/trunk/lib/python/pygrass/modules/grid/grid.py
grass/trunk/lib/python/pygrass/raster/testsuite/test_raster.py
grass/trunk/lib/python/pygrass/utils.py
grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py
grass/trunk/lib/python/script/core.py
grass/trunk/lib/python/script/db.py
grass/trunk/lib/python/script/raster.py
grass/trunk/lib/python/script/raster3d.py
grass/trunk/lib/python/temporal/aggregation.py
grass/trunk/lib/python/temporal/extract.py
grass/trunk/lib/python/temporal/mapcalc.py
grass/trunk/lib/python/temporal/register.py
grass/trunk/lib/python/temporal/space_time_datasets.py
grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
grass/trunk/lib/python/temporal/temporal_raster_algebra.py
grass/trunk/lib/python/temporal/temporal_vector_algebra.py
grass/trunk/lib/python/temporal/testsuite/test_register_function.py
grass/trunk/raster/r.category/test_rcategory_doctest.txt
grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh
grass/trunk/raster/r.li/r.li.setup/r.li.setup
grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
grass/trunk/raster/r.mapcalc/testsuite/test_r3_mapcalc.py
grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py
grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py
grass/trunk/raster/r.watershed/front/r.watershed.html
grass/trunk/raster/simwe/r.sim.water/spearfish.sh
grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py
grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
grass/trunk/scripts/d.rast.edit/d.rast.edit.py
grass/trunk/scripts/d.shadedmap/d.shadedmap.py
grass/trunk/scripts/db.in.ogr/db.in.ogr.py
grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
grass/trunk/scripts/i.pansharpen/i.pansharpen.py
grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py
grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py
grass/trunk/scripts/r.fillnulls/r.fillnulls.py
grass/trunk/scripts/r.grow/r.grow.py
grass/trunk/scripts/r.in.wms/wms_base.py
grass/trunk/scripts/r.mask/r.mask.py
grass/trunk/scripts/r.reclass.area/r.reclass.area.py
grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
grass/trunk/scripts/v.dissolve/v.dissolve.py
grass/trunk/scripts/v.out.gps/v.out.gps.py
grass/trunk/scripts/v.rast.stats/v.rast.stats.py
grass/trunk/scripts/v.to.lines/v.to.lines.py
grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
grass/trunk/scripts/v.unpack/v.unpack.py
grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py
grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
grass/trunk/temporal/t.register/test.t.register.vector.sh
grass/trunk/temporal/t.remove/t.remove.py
grass/trunk/temporal/t.rename/test.t.rename.sh
grass/trunk/temporal/t.support/test.t.support.sh
grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh
grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh
grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
grass/trunk/testsuite/raster/raster_md5test.sh
grass/trunk/testsuite/raster/rhemisphere.sh
grass/trunk/tools/thumbnails.py
grass/trunk/vector/v.distance/v.distance.html
grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py
Log:
Rename g.remove's names= to name= and use name= instead of pattern= as needed
Modified: grass/trunk/general/g.remove/g.remove.html
===================================================================
--- grass/trunk/general/g.remove/g.remove.html 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/general/g.remove/g.remove.html 2014-10-27 17:10:46 UTC (rev 62421)
@@ -10,7 +10,7 @@
Delete <tt>map1</tt> and <tt>map2</tt> raster maps in the current mapset:
<div class="code"><pre>
-g.remove -f type=rast pattern=tmp1,tmp2
+g.remove -f type=rast name=tmp1,tmp2
</pre></div>
Delete all raster and vector maps starting with "<tt>tmp_</tt>" in the current
Modified: grass/trunk/gui/wxpython/gmodeler/frame.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/frame.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/gmodeler/frame.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -327,13 +327,13 @@
if rast:
self._gconsole.RunCmd(['g.remove', '-f', 'type=rast',
- 'pattern=%s' %','.join(rast)])
+ 'name=%s' %','.join(rast)])
if rast3d:
self._gconsole.RunCmd(['g.remove', '-f', 'type=rast3d',
- 'pattern=%s' %','.join(rast3d)])
+ 'name=%s' %','.join(rast3d)])
if vect:
self._gconsole.RunCmd(['g.remove', '-f', 'type=vect',
- 'pattern=%s' %','.join(vect)])
+ 'name=%s' %','.join(vect)])
self.SetStatusText(_("%d maps deleted from current mapset") % \
int(len(rast) + len(rast3d) + len(vect)))
Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/gmodeler/model.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -709,11 +709,11 @@
rast, vect, rast3d, msg = self.GetIntermediateData()
if rast:
- log.RunCmd(['g.remove', '-f', 'type=rast', 'pattern=%s' %','.join(rast)])
+ log.RunCmd(['g.remove', '-f', 'type=rast', 'name=%s' %','.join(rast)])
if rast3d:
- log.RunCmd(['g.remove', '-f', 'type=rast3d', 'pattern=%s' %','.join(rast3d)])
+ log.RunCmd(['g.remove', '-f', 'type=rast3d', 'name=%s' %','.join(rast3d)])
if vect:
- log.RunCmd(['g.remove', '-f', 'type=vect', 'pattern=%s' %','.join(vect)])
+ log.RunCmd(['g.remove', '-f', 'type=vect', 'name=%s' %','.join(vect)])
def GetIntermediateData(self):
"""Get info about intermediate data"""
@@ -2339,17 +2339,17 @@
if rast:
self.fd.write(
r""" run_command('g.remove', flags='f', type='rast',
- pattern=%s)
+ name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast)))
if vect:
self.fd.write(
r""" run_command('g.remove', flags='f', type='vect',
- pattern=%s)
+ name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", vect)))
if rast3d:
self.fd.write(
r""" run_command('g.remove', flags='f', type='rast3d',
- pattern=%s)
+ name=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast3d)))
if not rast and not vect and not rast3d:
self.fd.write(' pass\n')
Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/iclass/frame.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -256,7 +256,7 @@
parent = self,
flags = 'f',
type = 'vect',
- pattern = self.trainingAreaVector)
+ name = self.trainingAreaVector)
if ret != 0:
return False
return True
@@ -269,7 +269,7 @@
parent = self,
flags = 'f',
type = 'rast',
- pattern = raster)
+ name = raster)
if ret != 0:
return False
return True
Modified: grass/trunk/gui/wxpython/iscatt/iscatt_core.py
===================================================================
--- grass/trunk/gui/wxpython/iscatt/iscatt_core.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/iscatt/iscatt_core.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -284,7 +284,7 @@
ret = UpdateCatRast(patch_rast, region, self.scatts_dt.GetCatRastCond(cat))
if ret < 0:
GException(_("Patching category raster conditions file failed."))
- RunCommand("g.remove", flags='f', type='rast', pattern=patch_rast)
+ RunCommand("g.remove", flags='f', type='rast', name=patch_rast)
def _rasterize(self, grass_region, layer, cat, out_rast):
@@ -598,7 +598,7 @@
del self.cats_rasts_conds[cat_id]
RunCommand("g.remove", flags='f', type='rast',
- pattern=self.cats_rasts[cat_id])
+ name=self.cats_rasts[cat_id])
del self.cats_rasts[cat_id]
return True
@@ -709,7 +709,7 @@
grass.try_remove(tmp)
for tmp in self.cats_rasts.itervalues():
RunCommand("g.remove", flags='f',
- type='rast', pattern=tmp,
+ type='rast', name=tmp,
getErrorMsg=True)
self.cats_rasts = {}
Modified: grass/trunk/gui/wxpython/lmgr/datacatalog.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/datacatalog.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/lmgr/datacatalog.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -416,17 +416,17 @@
self.showNotification.emit(message=label)
if (self.GetItemText(self.selected_type)=='vect'):
removed = RunCommand('g.remove', flags='f', type='vect',
- pattern=string)
+ name=string)
elif (self.GetItemText(self.selected_type)=='rast'):
removed = RunCommand('g.remove', flags='f', type='rast',
- pattern=string)
+ name=string)
else:
removed = RunCommand('g.remove', flags='f', type='rast3d',
- pattern=string)
+ name=string)
if (removed==0):
self.Delete(self.selected_layer)
Debug.msg(1,"LAYER "+string+" DELETED")
- label = "g.remove -f type="+self.GetItemText(self.selected_type)+" pattern="+string+" -- completed" # generate this message (command) automatically?
+ label = "g.remove -f type="+self.GetItemText(self.selected_type)+" name="+string+" -- completed" # generate this message (command) automatically?
self.showNotification.emit(message=label)
self.RestoreBackup()
Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -694,7 +694,7 @@
overwrite=overwrite, getErrorMsg=True)
grass.del_temp_region()
RunCommand('g.remove', type='rast', flags='f', quiet=True,
- names=[tmpName + '.r', tmpName + '.g', tmpName + '.b'])
+ name=[tmpName + '.r', tmpName + '.g', tmpName + '.b'])
if not returncode == 0:
self._giface.WriteError(_('Failed to run d.to.rast:\n') + messages)
grass.try_remove(pngFile)
Modified: grass/trunk/gui/wxpython/rlisetup/functions.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/functions.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/rlisetup/functions.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -86,7 +86,7 @@
grass.run_command('v.to.rast', input=vect, output=outrast, use='cat',
cats=cat, overwrite=True, quiet=True)
grass.run_command('g.remove', flags='f', type='vect',
- pattern=tmp_vect, quiet=True)
+ name=tmp_vect, quiet=True)
def obtainAreaVector(outrast):
Modified: grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/sampling_frame.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/rlisetup/sampling_frame.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -263,8 +263,8 @@
marea = MaskedArea(region, rasterName)
- RunCommand('g.remove', flags='f', type='rast', pattern=tmpraster)
- RunCommand('g.remove', flags='f', type='vect', pattern=tmpvector)
+ RunCommand('g.remove', flags='f', type='rast', name=tmpraster)
+ RunCommand('g.remove', flags='f', type='vect', name=tmpvector)
os.unlink(polyfile.name)
return marea
Modified: grass/trunk/gui/wxpython/vnet/vnet_core.py
===================================================================
--- grass/trunk/gui/wxpython/vnet/vnet_core.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/vnet/vnet_core.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -122,7 +122,7 @@
# for case there is some map with same name
# (when analysis does not produce any map, this map would have been shown as result)
RunCommand('g.remove', flags = 'f', type = 'vect',
- pattern = self.results["vect_map"].GetVectMapName())
+ name = self.results["vect_map"].GetVectMapName())
# save data from
self.history._saveAnInputToHist(analysis, params, flags)
Modified: grass/trunk/gui/wxpython/vnet/vnet_data.py
===================================================================
--- grass/trunk/gui/wxpython/vnet/vnet_data.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/gui/wxpython/vnet/vnet_data.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -939,7 +939,7 @@
if vectMap:
vectMap.DeleteRenderLayer()
RunCommand('g.remove', flags = 'f', type = 'vect',
- pattern = vectMap.GetVectMapName())
+ name = vectMap.GetVectMapName())
self.RemoveFromTmpMaps(vectMap)
return True
return False
@@ -949,7 +949,7 @@
update = False
for tmpMap in self.tmpMaps:
RunCommand('g.remove', flags = 'f', type = 'vect',
- pattern = tmpMap.GetVectMapName())
+ name = tmpMap.GetVectMapName())
if tmpMap.DeleteRenderLayer():
update = True
return update
Modified: grass/trunk/lib/gpde/test/test_arrays.c
===================================================================
--- grass/trunk/lib/gpde/test/test_arrays.c 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/gpde/test/test_arrays.c 2014-10-27 17:10:46 UTC (rev 62421)
@@ -294,7 +294,7 @@
sprintf(buff,
- "g.remove -f type=rast pattern=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+ "g.remove -f type=rast name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
system(buff);
N_free_array_2d(data1);
@@ -588,7 +588,7 @@
sprintf(buff,
- "g.remove -f type=rast pattern=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+ "g.remove -f type=rast name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
system(buff);
@@ -857,7 +857,7 @@
N_free_array_3d(tmp);
sprintf(buff,
- "g.remove -f type=rast3d pattern=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
+ "g.remove -f type=rast3d name=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
system(buff);
N_free_array_3d(data1);
Modified: grass/trunk/lib/python/gunittest/case.py
===================================================================
--- grass/trunk/lib/python/gunittest/case.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/gunittest/case.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -122,7 +122,7 @@
"does not corresond to currently set"
" WIND_OVERRIDE ({c})",
n=cls._temp_region, c=name)
- call_module("g.remove", quiet=True, flags='f', type='region', pattern=name)
+ call_module("g.remove", quiet=True, flags='f', type='region', name=name)
# TODO: we don't know if user calls this
# so perhaps some decorator which would use with statemet
# but we have zero chance of infuencing another test class
@@ -625,7 +625,7 @@
sep='=', precision=precision,
reference=statistics, msg=msg)
finally:
- call_module('g.remove', flags='f', type='rast', pattern=diff)
+ call_module('g.remove', flags='f', type='rast', name=diff)
else:
# general case
# TODO: we are using r.info min max and r.univar min max interchangably
@@ -651,7 +651,7 @@
self.assertRasterFitsUnivar(raster=diff, reference=statistics,
precision=precision, msg=msg)
finally:
- call_module('g.remove', flags='f', type='rast', pattern=diff)
+ call_module('g.remove', flags='f', type='rast', name=diff)
def assertRasters3dNoDifference(self, actual, reference,
precision, statistics=None, msg=None):
@@ -672,7 +672,7 @@
sep='=', precision=precision,
reference=statistics, msg=msg)
finally:
- call_module('g.remove', flags='f', type='rast3d', pattern=diff)
+ call_module('g.remove', flags='f', type='rast3d', name=diff)
else:
# general case
# TODO: we are using r.info min max and r.univar min max interchangably
@@ -698,7 +698,7 @@
self.assertRaster3dFitsUnivar(raster=diff, reference=statistics,
precision=precision, msg=msg)
finally:
- call_module('g.remove', flags='f', type='rast3d', pattern=diff)
+ call_module('g.remove', flags='f', type='rast3d', name=diff)
# TODO: this works only in 2D
# TODO: write tests
@@ -741,7 +741,7 @@
reference=ref_info,
msg=msg, precision=precision)
finally:
- call_module('g.remove', flags='f', type='vect', pattern=remove)
+ call_module('g.remove', flags='f', type='vect', name=remove)
# TODO: write tests
def assertVectorsNoAreaDifference(self, actual, reference, precision,
@@ -774,7 +774,7 @@
va=actual, vr=reference, p=precision, a=total_area)
self.fail(self._formatMessage(msg, stdmsg))
finally:
- call_module('g.remove', flags='f', type='vect', pattern=diff)
+ call_module('g.remove', flags='f', type='vect', name=diff)
# TODO: here we have to have significant digits which is not consistent
# TODO: documentation for all new asserts
@@ -838,7 +838,7 @@
# we rely on fail method to either raise or return (soon)
os.remove(factual)
if vreference:
- self.runModule('g.remove', flags='f', type='vect', pattern=vreference)
+ self.runModule('g.remove', flags='f', type='vect', name=vreference)
# TODO: we expect v.out.ascii to give the same order all the time, is that OK?
def assertVectorAsciiEqualsVectorAscii(self, actual, reference,
Modified: grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py
===================================================================
--- grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -30,7 +30,7 @@
cls.del_temp_region()
# TODO: input as list does not work, why?
cls.runModule('g.remove', flags='f', type='rast3d',
- pattern=','.join([cls.constant_map, cls.rcd_increasing_map]))
+ name=','.join([cls.constant_map, cls.rcd_increasing_map]))
def test_assertRaster3dFitsUnivar(self):
reference = dict(n=1000000,
Modified: grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py
===================================================================
--- grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -139,7 +139,7 @@
# is deleted
if cls.maps_to_remove:
cls.runModule('g.remove', flags='f', type='vect',
- pattern=','.join(cls.maps_to_remove))
+ name=','.join(cls.maps_to_remove))
def test_assertVectorEqualsVector_basic(self):
"""Check completely different maps."""
Modified: grass/trunk/lib/python/pygrass/modules/grid/grid.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/grid/grid.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/pygrass/modules/grid/grid.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -250,7 +250,7 @@
mpclc(expression="%s=%s" % (name, rast), overwrite=True, env_=env)
file_dst = "%s.pack" % os.path.join(path_dst, name)
rpck(input=name, output=file_dst, overwrite=True, env_=env)
- remove(flags='f', type='rast', pattern=name, env_=env)
+ remove(flags='f', type='rast', name=name, env_=env)
# change gisdbase to dst
env['GISRC'] = gisrc_dst
rupck(input=file_dst, output=rast_clean, overwrite=True, env_=env)
@@ -284,7 +284,7 @@
name = nam % vect
file_dst = "%s.pack" % os.path.join(path_dst, name)
vpck(input=name, output=file_dst, overwrite=True, env_=env)
- remove(flags='f', type='vect', pattern=name, env_=env)
+ remove(flags='f', type='vect', name=name, env_=env)
# change gisdbase to dst
env['GISRC'] = gisrc_dst
vupck(input=file_dst, output=vect, overwrite=True, env_=env)
Modified: grass/trunk/lib/python/pygrass/raster/testsuite/test_raster.py
===================================================================
--- grass/trunk/lib/python/pygrass/raster/testsuite/test_raster.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/pygrass/raster/testsuite/test_raster.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -21,7 +21,7 @@
def tearDownClass(cls):
"""Remove the generated vector map, if exist"""
from grass.pygrass.modules.shortcuts import general as g
- g.remove(type='rast', pattern=cls.tmp, flags='f')
+ g.remove(type='rast', name=cls.tmp, flags='f')
def test_type(self):
r = RasterRow(self.name)
Modified: grass/trunk/lib/python/pygrass/utils.py
===================================================================
--- grass/trunk/lib/python/pygrass/utils.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/pygrass/utils.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -92,7 +92,7 @@
def remove(oldname, maptype):
"""Remove a map"""
grasscore.run_command('g.remove', quiet=True, flags='f',
- type=maptype, pattern=oldname)
+ type=maptype, name=oldname)
def rename(oldname, newname, maptype, **kwargs):
Modified: grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py
===================================================================
--- grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -61,7 +61,7 @@
"""Remove the generated vector map, if exist"""
mset = get_mapset_vector(cls.tmpname, mapset='')
if mset:
- run_command("g.remove", flags='f', type='vect', pattern=cls.tmpname)
+ run_command("g.remove", flags='f', type='vect', name=cls.tmpname)
if __name__ == '__main__':
Modified: grass/trunk/lib/python/script/core.py
===================================================================
--- grass/trunk/lib/python/script/core.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/script/core.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -1017,7 +1017,7 @@
"""Unsets WIND_OVERRIDE and removes any region named by it."""
try:
name = os.environ.pop('WIND_OVERRIDE')
- run_command("g.remove", flags='f', quiet=True, type='region', pattern=name)
+ run_command("g.remove", flags='f', quiet=True, type='region', name=name)
except:
pass
Modified: grass/trunk/lib/python/script/db.py
===================================================================
--- grass/trunk/lib/python/script/db.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/script/db.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -31,7 +31,7 @@
0
>>> db_describe('myfirestations') # doctest: +ELLIPSIS
{'nrows': 71, 'cols': [['cat', 'INTEGER', '20'], ... 'ncols': 22}
- >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
0
:param str table: table name
@@ -71,7 +71,7 @@
0
>>> db_table_exist('myfirestations')
True
- >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
0
:param str table: table name
@@ -118,7 +118,7 @@
>>> db_select(table = 'myfirestations') # doctest: +ELLIPSIS
(('1', '24', 'Morrisville #3', ... 'HS2A', '1.37'))
- >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
0
:param str sql: SQL statement to perform (or None)
@@ -164,7 +164,7 @@
>>> db_table_in_vector('myfirestations')
['myfirestations at user1']
>>> db_table_in_vector('mfirestations')
- >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
0
:param str table: name of table to query
Modified: grass/trunk/lib/python/script/raster.py
===================================================================
--- grass/trunk/lib/python/script/raster.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/script/raster.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -119,7 +119,7 @@
0
>>> p2.wait()
1
- >>> run_command('g.remove', flags='f', type='rast', pattern=output)
+ >>> run_command('g.remove', flags='f', type='rast', name=output)
:param str exp: expression
:param bool quiet: True to run quietly (<tt>--q</tt>)
Modified: grass/trunk/lib/python/script/raster3d.py
===================================================================
--- grass/trunk/lib/python/script/raster3d.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/script/raster3d.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -32,7 +32,7 @@
>>> mapcalc3d('volume = row() + col() + depth()')
>>> raster3d_info('volume') # doctest: +ELLIPSIS
{'vertical_units': '"units"', 'tbres': 1.0, ... 'south': 185000.0}
- >>> run_command('g.remove', flags='f', type='rast3d', pattern='volume')
+ >>> run_command('g.remove', flags='f', type='rast3d', name='volume')
0
:param str map: map name
Modified: grass/trunk/lib/python/temporal/aggregation.py
===================================================================
--- grass/trunk/lib/python/temporal/aggregation.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/aggregation.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -170,7 +170,7 @@
new_map.metadata.get_max() is None:
if not register_null:
gscript.run_command("g.remove", flags='f', type='rast',
- pattern=output)
+ name=output)
return None
return new_map
Modified: grass/trunk/lib/python/temporal/extract.py
===================================================================
--- grass/trunk/lib/python/temporal/extract.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/extract.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -234,13 +234,13 @@
count += 1
if type == "raster":
gscript.run_command("g.remove", flags='f', type='rast',
- pattern=names, quiet=True)
+ name=names, quiet=True)
elif type == "raster3d":
gscript.run_command("g.remove", flags='f', type='rast3d',
- pattern=names, quiet=True)
+ name=names, quiet=True)
elif type == "vector":
gscript.run_command("g.remove", flags='f', type='vect',
- pattern=names, quiet=True)
+ name=names, quiet=True)
dbif.close()
Modified: grass/trunk/lib/python/temporal/mapcalc.py
===================================================================
--- grass/trunk/lib/python/temporal/mapcalc.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/mapcalc.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -328,10 +328,10 @@
count += 1
if type == "raster":
gscript.run_command("g.remove", flags='f', type='rast',
- pattern=names, quiet=True)
+ name=names, quiet=True)
elif type == "raster3d":
gscript.run_command("g.remove", flags='f', type='rast3d',
- pattern=names, quiet=True)
+ name=names, quiet=True)
dbif.close()
Modified: grass/trunk/lib/python/temporal/register.py
===================================================================
--- grass/trunk/lib/python/temporal/register.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/register.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -488,7 +488,7 @@
if map.is_in_db(dbif):
map.delete(dbif)
mod = copy.deepcopy(g_remove)
- mod(type='rast', pattern=map.get_name())
+ mod(type='rast', name=map.get_name())
mod.run()
if connected:
Modified: grass/trunk/lib/python/temporal/space_time_datasets.py
===================================================================
--- grass/trunk/lib/python/temporal/space_time_datasets.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/space_time_datasets.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -100,7 +100,7 @@
>>> rmap.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="rast", pattern=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="rast", name=name, quiet=True)
0
>>> grass.del_temp_region()
@@ -418,7 +418,7 @@
True
>>> r3map.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="rast3d", pattern=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="rast3d", name=name, quiet=True)
0
>>> grass.del_temp_region()
@@ -746,7 +746,7 @@
True
>>> vmap.is_time_relative()
False
- >>> grass.run_command("g.remove", flags="f", type="vect", pattern=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="vect", name=name, quiet=True)
0
>>> grass.del_temp_region()
Modified: grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -53,7 +53,7 @@
if self.run:
m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "rast3d"
- m.inputs["pattern"].value = stringlist
+ m.inputs["name"].value = stringlist
m.flags["f"].value = True
m.run()
Modified: grass/trunk/lib/python/temporal/temporal_raster_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster_algebra.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/temporal_raster_algebra.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -94,7 +94,7 @@
if self.run:
m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "rast"
- m.inputs["pattern"].value = stringlist
+ m.inputs["name"].value = stringlist
m.flags["f"].value = True
m.run()
Modified: grass/trunk/lib/python/temporal/temporal_vector_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_vector_algebra.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/temporal_vector_algebra.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -519,12 +519,12 @@
for chunk in chunklist:
stringlist = ",".join(chunk)
if self.debug:
- print "g.remove type=vect pattern=%s" % (stringlist)
+ print "g.remove type=vect name=%s" % (stringlist)
if self.run:
m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "vect"
- m.inputs["pattern"].value = stringlist
+ m.inputs["name"].value = stringlist
m.flags["f"].value = True
m.run()
Modified: grass/trunk/lib/python/temporal/testsuite/test_register_function.py
===================================================================
--- grass/trunk/lib/python/temporal/testsuite/test_register_function.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/lib/python/temporal/testsuite/test_register_function.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -52,7 +52,7 @@
"""!Remove maps from temporal database
"""
self.runModule("t.unregister", maps="register_map_1,register_map_2", quiet=True)
- self.runModule("g.remove", flags='f', type="rast", pattern="register_map_1,register_map_2", quiet=True)
+ self.runModule("g.remove", flags='f', type="rast", name="register_map_1,register_map_2", quiet=True)
self.strds_abs.delete()
self.strds_rel.delete()
Modified: grass/trunk/raster/r.category/test_rcategory_doctest.txt
===================================================================
--- grass/trunk/raster/r.category/test_rcategory_doctest.txt 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.category/test_rcategory_doctest.txt 2014-10-27 17:10:46 UTC (rev 62421)
@@ -231,9 +231,9 @@
when test finishes. It could test if everything which was expected
to be created was created if it would check all outputs properly.
->>> run_command('g.remove', flags='f', type='rast', pattern='test')
+>>> run_command('g.remove', flags='f', type='rast', name='test')
0
->>> run_command('g.remove', flags='f', type='rast', pattern='test_14')
+>>> run_command('g.remove', flags='f', type='rast', name='test_14')
0
->>> run_command('g.remove', flags='f', type='rast', pattern='test_d')
+>>> run_command('g.remove', flags='f', type='rast', name='test_d')
0
Modified: grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -104,7 +104,7 @@
eval `g.findfile elem=windows file="tmp_rli_selmsk.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_selmsk.$$"
- g.remove -f type=region pattern="tmp_rli_selmsk.$$" --quiet
+ g.remove -f type=region name="tmp_rli_selmsk.$$" --quiet
fi
rm -f "$TMP" "$TMP".val
@@ -190,8 +190,8 @@
"$GIS_OPT_conf"
# remove tmp raster and vector
- g.remove -f type=rast pattern="tmp_rli_mask.$$" --quiet
- g.remove -f type=vect pattern="tmp_rli_mask_v$$" --quiet
+ g.remove -f type=rast name="tmp_rli_mask.$$" --quiet
+ g.remove -f type=vect name="tmp_rli_mask_v$$" --quiet
if [ "$GIS_FLAG_f" -eq 1 ] ; then
g.region n="$GIS_OPT_north" s="$GIS_OPT_south" \
Modified: grass/trunk/raster/r.li/r.li.setup/r.li.setup
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/r.li.setup 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.li/r.li.setup/r.li.setup 2014-10-27 17:10:46 UTC (rev 62421)
@@ -33,7 +33,7 @@
eval `g.findfile elem=windows file="tmp_rlisetup.$$" | grep '^name='`
if [ -n "$name" ] ; then
unset WIND_OVERRIDE
- g.remove -f type=region pattern="tmp_rlisetup.$$" --quiet
+ g.remove -f type=region name="tmp_rlisetup.$$" --quiet
fi
}
trap "cleanup" 2 3 15
Modified: grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -71,7 +71,7 @@
eval `g.findfile elem=windows file="tmp_rli_sampvect.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_sampvect.$$"
- g.remove -f type=region pattern="tmp_rli_sampvect.$$" --quiet
+ g.remove -f type=region name="tmp_rli_sampvect.$$" --quiet
fi
rm -f "$TMP"*
@@ -184,12 +184,12 @@
echo "MASKEDOVERLAYAREA $mask_name|$n|$s|$e|$w" >> "$GIS_OPT_conf"
elif [ "$ok" -eq -1 ] ; then
- g.remove -f type=vect pattern="$EXTRACT" --quiet
+ g.remove -f type=vect name="$EXTRACT" --quiet
break
fi
#remove temporary vector map created from v.extract
- g.remove -f type=vect pattern="$EXTRACT" --quiet
+ g.remove -f type=vect name="$EXTRACT" --quiet
done < "$TMP.cat"
Modified: grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -90,7 +90,7 @@
eval `g.findfile elem=windows file="tmp_rli_sq.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_sq.$$"
- g.remove -f type=region pattern="tmp_rli_sq.$$" --quiet
+ g.remove -f type=region name="tmp_rli_sq.$$" --quiet
fi
rm -f "$TMP" "$TMP.var"
Modified: grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -43,7 +43,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove -f type=rast pattern=$TMPNAME > /dev/null
+ g.remove -f type=rast name=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -59,11 +59,11 @@
{
echo "Restoring user region"
g.region region=$TMPNAME
- g.remove -f type=region pattern=$TMPNAME > /dev/null
+ g.remove -f type=region name=$TMPNAME > /dev/null
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove -f type=rast pattern=MASK > /dev/null
+ g.remove -f type=rast name=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/raster/r.mapcalc/testsuite/test_r3_mapcalc.py
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/test_r3_mapcalc.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.mapcalc/testsuite/test_r3_mapcalc.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -22,7 +22,7 @@
cls.del_temp_region()
if cls.to_remove:
cls.runModule('g.remove', flags='f', type='rast3d',
- pattern=','.join(cls.to_remove), verbose=True)
+ name=','.join(cls.to_remove), verbose=True)
def test_difference_of_the_same_map_double(self):
"""Test zero difference of map with itself"""
Modified: grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -74,7 +74,7 @@
cls.del_temp_region()
if cls.to_remove:
cls.runModule('g.remove', flags='f', type='rast',
- pattern=','.join(cls.to_remove))
+ name=','.join(cls.to_remove))
def rinfo_contains_number(self, raster, number):
"""Test that r.info standard output for raster contains a given number
@@ -179,7 +179,7 @@
cls.del_temp_region()
if cls.to_remove:
cls.runModule('g.remove', flags='f', type='rast',
- pattern=','.join(cls.to_remove), verbose=True)
+ name=','.join(cls.to_remove), verbose=True)
def test_difference_of_the_same_map_double(self):
"""Test zero difference of map with itself"""
Modified: grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
===================================================================
--- grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -68,7 +68,7 @@
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
- cls.runModule('g.remove', flags='f', type='rast', pattern=cls.elevation)
+ cls.runModule('g.remove', flags='f', type='rast', name=cls.elevation)
def test_slope(self):
ref_slope = 'reference_slope'
Modified: grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py
===================================================================
--- grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -19,7 +19,7 @@
"""Remove viewshed map after each test method"""
# TODO: eventually, removing maps should be handled through testing framework fucntions
cls.runModule('g.remove', flags='f', type='rast',
- pattern=cls.viewshed)
+ name=cls.viewshed)
def test_limits(self):
"""Test if results is in expected limits"""
@@ -92,10 +92,10 @@
def tearDownClass(cls):
cls.del_temp_region()
cls.runModule('g.remove', flags='f', type='rast',
- pattern=cls.elevation)
+ name=cls.elevation)
if cls.to_remove:
cls.runModule('g.remove', flags='f', type='rast',
- pattern=','.join(cls.to_remove))
+ name=','.join(cls.to_remove))
def test_viewshed(self):
ref_viewshed = 'reference_viewshed'
Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html 2014-10-27 17:10:46 UTC (rev 62421)
@@ -422,7 +422,7 @@
abs(rwater.accum), \
null() )"
r.colors -g rwater.course col=bcyr
- g.remove -f type=rast pattern=MASK
+ g.remove -f type=rast name=MASK
# <i>Thinning is required before converting raster lines to vector</i>
r.thin in=rwater.course out=rwater.course.Thin
Modified: grass/trunk/raster/simwe/r.sim.water/spearfish.sh
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/spearfish.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster/simwe/r.sim.water/spearfish.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -57,5 +57,5 @@
echo "Step throu the time steps and adjust the color tables"
# cleanup
-g.remove --q -f type=rast pattern=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
-g.remove --q -f type=vect pattern=observation_points
+g.remove --q -f type=rast name=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
+g.remove --q -f type=vect name=observation_points
Modified: grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py
===================================================================
--- grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -54,8 +54,8 @@
def tearDownClass(cls):
"""!Remove the temporary region"""
cls.del_temp_region()
- cls.runModule('g.remove', flags='f', type='rast3d', pattern=','.join(['map_1', 'map_2', 'map_3', 'map_4', 'map_5', 'test_flowaccum']))
- cls.runModule('g.remove', flags='f', type='vect', pattern=','.join(['test_flowline', 'test_seeds']))
+ cls.runModule('g.remove', flags='f', type='rast3d', name=','.join(['map_1', 'map_2', 'map_3', 'map_4', 'map_5', 'test_flowaccum']))
+ cls.runModule('g.remove', flags='f', type='vect', name=','.join(['test_flowline', 'test_seeds']))
os.remove('./data/flowline_tmp.ascii')
def test_interpolation(self):
Modified: grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
===================================================================
--- grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -115,7 +115,7 @@
"""!Remove the temporary region"""
cls.del_temp_region()
cls.runModule('g.remove', flags='f', type='rast3d',
- pattern=','.join(['test_map_1_ref', 'test_map_2_ref',
+ name=','.join(['test_map_1_ref', 'test_map_2_ref',
'test_grad_x', 'test_grad_y',
'test_grad_z', 'test_null_grad_x',
'test_null_grad_y', 'test_null_grad_z']))
Modified: grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
===================================================================
--- grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -31,4 +31,4 @@
r3.info volume_time_float
ncdump -h test_time_float.nc
-g.remove -f type=rast3 pattern=volume_float,volume_double,volume_time_double,volume_time_float
+g.remove -f type=rast3 name=volume_float,volume_double,volume_time_double,volume_time_float
Modified: grass/trunk/scripts/d.rast.edit/d.rast.edit.py
===================================================================
--- grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -495,7 +495,7 @@
def cleanup(self):
grass.try_remove(self.tempfile)
- run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
def finalize(self):
self.save_map()
@@ -529,7 +529,7 @@
run('g.region', rast = self.inmap)
run('r.patch', input = (self.tempmap, self.outmap), output = self.outmap, overwrite = True)
run('r.colors', map = self.outmap, rast = self.inmap)
- run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
def read_header(self, infile):
wind = {}
@@ -635,7 +635,7 @@
run('r.mapcalc', expression = "%s = %d" % (self.tempmap, val))
run('r.colors', map = self.tempmap, rast = self.inmap)
run('r.out.ppm', input = self.tempmap, out = self.tempfile)
- run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', name = self.tempmap)
tempimg = wx.Image(self.tempfile)
grass.try_remove(self.tempfile)
Modified: grass/trunk/scripts/d.shadedmap/d.shadedmap.py
===================================================================
--- grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -61,7 +61,7 @@
grass.run_command('r.composite', red = tmp_r, green = tmp_g,
blue = tmp_b, output = output_map)
grass.run_command('g.remove', flags = 'f', quiet = True, type='rast',
- pattern = '%s,%s,%s' % (tmp_r, tmp_g, tmp_b))
+ name = '%s,%s,%s' % (tmp_r, tmp_g, tmp_b))
ret = grass.run_command("d.his", h_map = drape_map, i_map = relief_map,
Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -108,7 +108,7 @@
else:
# remove the vector part
grass.run_command('v.db.connect', quiet = True, map = output, layer = '1', flags = 'd')
- grass.run_command('g.remove', flags = 'f', quiet = True, type = 'vect', pattern = output)
+ grass.run_command('g.remove', flags = 'f', quiet = True, type = 'vect', name = output)
# get rid of superfluous auto-added cat column (and cat_ if present)
nuldev = file(os.devnull, 'w+')
Modified: grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
===================================================================
--- grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -177,7 +177,7 @@
grass.message(_("Remapping digital numbers to NDVI..."))
tmpname = "%s_%s" % (name, pid)
grass.mapcalc("$tmpname = 0.004 * $name - 0.1", tmpname = tmpname, name = name)
- grass.run_command('g.remove', flags = 'f', type = 'rast', pattern = name, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast', name = name, quiet = True)
grass.run_command('g.rename', rast = (tmpname, name), quiet = True)
# write cmd history:
Modified: grass/trunk/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/trunk/scripts/i.pansharpen/i.pansharpen.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/i.pansharpen/i.pansharpen.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -176,7 +176,7 @@
# Cleanup
grass.run_command('g.remove', flags='f', quiet=True, type='rast',
- pattern='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
+ name='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
elif sharpen == "ihs":
grass.verbose(_("Using IHS<->RGB algorithm"))
@@ -207,7 +207,7 @@
# Cleanup
grass.run_command('g.remove', flags='f', quiet=True, type='rast',
- pattern=panmatch)
+ name=panmatch)
elif sharpen == "pca":
grass.verbose(_("Using PCA/inverse PCA algorithm"))
@@ -422,7 +422,7 @@
result = grass.core.find_file(matched, element = 'cell')
if result['fullname']:
grass.run_command('g.remove', flags='f', quiet=True, type='rast',
- pattern=matched)
+ name=matched)
grass.run_command('r.reclass', input=original, out=matched, rules=outfile.name)
else:
grass.run_command('r.reclass', input=original, out=matched, rules=outfile.name)
Modified: grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py
===================================================================
--- grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -58,9 +58,9 @@
# what to do in case of user break:
def cleanup():
if grass.find_file(temp_src)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = temp_src)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', name = temp_src)
if grass.find_file(temp_dist)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = temp_dist)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', name = temp_dist)
def main():
global temp_dist, temp_src
Modified: grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py
===================================================================
--- grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -41,7 +41,7 @@
def cleanup():
if tmpmap:
grass.run_command('g.remove', flags = 'f', type = 'rast',
- pattern = tmpmap, quiet = True)
+ name = tmpmap, quiet = True)
def main():
global tmpmap
Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -100,9 +100,9 @@
def cleanup():
#delete internal mask and any TMP files:
if len(tmp_vmaps) > 0:
- grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'vect', pattern = tmp_vmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'vect', name = tmp_vmaps)
if len(tmp_rmaps) > 0:
- grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = tmp_rmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', name = tmp_rmaps)
if usermask and mapset:
if grass.find_file(usermask, mapset = mapset)['file']:
grass.run_command('g.rename', quiet = True, rast = (usermask, 'MASK'), overwrite = True)
@@ -233,7 +233,7 @@
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
# remove temporary map to not overfill disk
- if grass.run_command('g.remove', flags = 'fb', type = 'vect', pattern = holename + '_pol', quiet = quiet) != 0:
+ if grass.run_command('g.remove', flags = 'fb', type = 'vect', name = holename + '_pol', quiet = quiet) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
tmp_vmaps.remove(holename + '_pol')
@@ -325,14 +325,14 @@
tmp_rmaps.remove(holename + '_dem')
except:
pass
- if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'rast', pattern =
+ if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'rast', name =
(holename, holename + '_grown', holename + '_edges', holename + '_dem')) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
try:
tmp_vmaps.remove(holename)
except:
pass
- if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'vect', pattern = holename) != 0:
+ if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'vect', name = holename) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
#check if method is different from rst to use r.resamp.bspline
Modified: grass/trunk/scripts/r.grow/r.grow.py
===================================================================
--- grass/trunk/scripts/r.grow/r.grow.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.grow/r.grow.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -69,7 +69,7 @@
for map in [temp_dist, temp_val]:
if map:
grass.run_command('g.remove', flags = 'fb', quiet = True,
- type='rast', pattern = map)
+ type='rast', name = map)
def main():
global temp_dist, temp_val
Modified: grass/trunk/scripts/r.in.wms/wms_base.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_base.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.in.wms/wms_base.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -466,7 +466,7 @@
quiet = True,
flags = 'fb',
type = 'rast',
- pattern = ','.join(maps))
+ name = ','.join(maps))
# delete environmental variable which overrides region
if 'GRASS_REGION' in os.environ.keys():
Modified: grass/trunk/scripts/r.mask/r.mask.py
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.mask/r.mask.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -74,10 +74,10 @@
def cleanup():
if tmp:
grass.run_command('g.remove', flags = 'f', type = 'rast',
- pattern = tmp, quiet = True)
+ name = tmp, quiet = True)
if tmp_hull:
grass.run_command('g.remove', flags = 'f', type = 'vect',
- pattern = tmp_hull, quiet = True)
+ name = tmp_hull, quiet = True)
def main():
raster = options['raster']
@@ -99,7 +99,7 @@
# -> remove
if exists:
grass.run_command('g.remove', flags = 'f', quiet = True,
- type = 'rast', pattern = 'MASK')
+ type = 'rast', name = 'MASK')
grass.message(_("Raster MASK removed"))
else:
grass.fatal(_("No existing MASK to remove"))
@@ -111,7 +111,7 @@
else:
grass.warning(_("MASK already exists and will be overwritten"))
grass.run_command('g.remove', flags = 'f', quiet = True,
- type = 'rast', pattern = 'MASK')
+ type = 'rast', name = 'MASK')
if raster:
# check if input raster exists
Modified: grass/trunk/scripts/r.reclass.area/r.reclass.area.py
===================================================================
--- grass/trunk/scripts/r.reclass.area/r.reclass.area.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -229,10 +229,10 @@
TMPRAST.reverse() # reclassed map first
for mapp in TMPRAST:
if METHOD == 'rmarea':
- grass.run_command("g.remove", flags='f', type='vect', pattern=mapp,
+ grass.run_command("g.remove", flags='f', type='vect', name=mapp,
quiet=True)
else:
- grass.run_command("g.remove", flags='f', type='rast', pattern=mapp,
+ grass.run_command("g.remove", flags='f', type='rast', name=mapp,
quiet=True)
if __name__ == "__main__":
Modified: grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
===================================================================
--- grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -21,7 +21,7 @@
r.pack --o --v -c input=test_double output=test_double_uncompressed.pack
# Remove generated maps and re-import
-g.remove -f type=rast pattern=test_int,test_float,test_double
+g.remove -f type=rast name=test_int,test_float,test_double
# Second we check the import with r.unpack
r.unpack --o --v input=test_int.pack
@@ -42,5 +42,5 @@
#r.out.ascii --o input=test_float_uncompressed output=test_float_uncompressed.ref dp=1
#r.out.ascii --o input=test_double_uncompressed output=test_double_uncompressed.ref dp=1
-g.remove -f type=rast pattern=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
+g.remove -f type=rast name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
rm *.pack
Modified: grass/trunk/scripts/v.dissolve/v.dissolve.py
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -40,7 +40,7 @@
def cleanup():
nuldev = file(os.devnull, 'w')
- grass.run_command('g.remove', flags = 'f', type = 'vect', pattern = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
+ grass.run_command('g.remove', flags = 'f', type = 'vect', name = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
def main():
global output, tmp
Modified: grass/trunk/scripts/v.out.gps/v.out.gps.py
===================================================================
--- grass/trunk/scripts/v.out.gps/v.out.gps.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.out.gps/v.out.gps.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -100,11 +100,11 @@
if tmp_vogb:
if grass.find_file(tmp_vogb, element = 'vector')['name']:
grass.run_command('g.remove', flags = 'f', type = 'vect',
- pattern = tmp_vogb, quiet = True)
+ name = tmp_vogb, quiet = True)
if tmp_extr:
if grass.find_file(tmp_extr, element = 'vector')['name']:
grass.run_command('g.remove', flags = 'f', type = 'vect',
- pattern = tmp_vogb, quiet = True)
+ name = tmp_vogb, quiet = True)
tmp = None
tmp_proj = None
Modified: grass/trunk/scripts/v.rast.stats/v.rast.stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -70,9 +70,9 @@
def cleanup():
if rastertmp:
grass.run_command('g.remove', flags='f', type='rast',
- pattern=rastertmp, quiet=True)
+ name=rastertmp, quiet=True)
grass.run_command('g.remove', flags='f', type='rast',
- pattern='MASK', quiet=True, stderr=nuldev)
+ name='MASK', quiet=True, stderr=nuldev)
if mask_found:
grass.message(_("Restoring previous MASK..."))
grass.run_command('g.rename', rast=(tmpname + "_origmask", 'MASK'),
@@ -282,7 +282,7 @@
database=fi['database'], driver=fi['driver'])
grass.run_command('g.remove', flags='f', type='rast',
- pattern='MASK', quiet=True, stderr=nuldev)
+ name='MASK', quiet=True, stderr=nuldev)
if exitcode == 0:
grass.verbose((_("Statistics calculated from raster map <%s>") % raster) +
Modified: grass/trunk/scripts/v.to.lines/v.to.lines.py
===================================================================
--- grass/trunk/scripts/v.to.lines/v.to.lines.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.to.lines/v.to.lines.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -90,25 +90,25 @@
option='add', input=input, out=input_tmp,
quiet=quiet):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=input_tmp, quiet=quiet)
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error creating layer 2"))
if 0 != grass.run_command('v.db.addtable', map=input_tmp, layer="2",
columns="left integer,right integer",
quiet=quiet):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=input_tmp, quiet=quiet)
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error creating new table for layer 2"))
if 0 != grass.run_command('v.to.db', map=input_tmp, option="sides",
columns="left,right", layer="2", quiet=quiet):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=input_tmp, quiet=quiet)
+ name=input_tmp, quiet=quiet)
grass.fatal(_("Error populating new table for layer 2"))
if 0 != grass.run_command('v.type', input=input_tmp, output=out_type,
from_type='boundary', to_type='line',
quiet=quiet, layer="2"):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=remove_names, quiet=quiet)
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error converting polygon to line"))
report = grass.read_command('v.category', flags='g', input=out_type,
option='report', quiet=quiet).split('\n')
@@ -122,14 +122,14 @@
type='centroid', layer=2, quiet=quiet,
cats='{mi}-{ma}'.format(mi=min_cat, ma=max_cat)):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=remove_names, quiet=quiet)
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error removing centroids"))
try:
if 0 != grass.run_command('v.db.droptable', map=out_type, layer=1,
flags='f', quiet=True):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=remove_names, quiet=quiet)
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error removing table from layer 1"))
except:
grass.warning(_("No table for layer %d" % 1))
@@ -137,13 +137,13 @@
output=output, layer="2,1", quiet=quiet,
overwrite=overwrite):
grass.run_command('g.remove', flags='f', type='vect',
- pattern=remove_names, quiet=quiet)
+ name=remove_names, quiet=quiet)
grass.fatal(_("Error adding categories"))
grass.run_command('g.remove', flags='f', type='vect',
- pattern=remove_names, quiet=quiet)
+ name=remove_names, quiet=quiet)
if point:
grass.run_command('g.remove', flags='f', type='vect',
- pattern=out_temp, quiet=quiet)
+ name=out_temp, quiet=quiet)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
===================================================================
--- grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -19,7 +19,7 @@
db.copy from_table=probe_orig to_table=probe_3_3
# Removing un-needed vectors and tables
-g.remove -f type=vect pattern=probe_orig
+g.remove -f type=vect name=probe_orig
v.db.droptable -f map=probe_3 table=probe_3 layer=1
# Adding tables to layer
@@ -37,7 +37,7 @@
v.pack --o -c input=probe_3 output=probe_3_uncompressed.pack
# We need to clean before import
-g.remove -f type=vect pattern=probe_1,probe_2,probe_3
+g.remove -f type=vect name=probe_1,probe_2,probe_3
# Test the import with v.unpack
v.unpack --o input=probe_1.pack
@@ -55,5 +55,5 @@
v.unpack --o input=probe_3.pack output=probe_3_uncompressed
v.category input=probe_3_uncompressed option=report
-g.remove -f type=vect pattern=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
+g.remove -f type=vect name=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
rm *.pack
Modified: grass/trunk/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/trunk/scripts/v.unpack/v.unpack.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/scripts/v.unpack/v.unpack.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -91,7 +91,7 @@
elif overwrite == '1' and gfile['file']:
grass.warning(_("Vector map <%s> already exists and will be overwritten") % map_name)
grass.run_command('g.remove', flags='f', quiet=True, type='vect',
- pattern=map_name)
+ name=map_name)
shutil.rmtree(new_dir, True)
# extract data
Modified: grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -49,4 +49,4 @@
t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -418,7 +418,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", flags='f', type="rast", pattern=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
############################################################################
Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -500,7 +500,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.remove", flags='f', type="rast", pattern=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="rast", name=map.get_name(), quiet=True)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -31,4 +31,4 @@
t.unregister --v type=rast maps=prec_1,prec_2,prec_3,prec_6,prec_7
t.remove --v type=strds input=precip_abs
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_6,prec_7
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_6,prec_7
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -75,7 +75,7 @@
# Cleaning up
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_rel
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -74,7 +74,7 @@
# Cleaning up
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -59,7 +59,7 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export_pack.tar.gz
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -47,7 +47,7 @@
t.info type=strds input=precip_abs4
# Let the test fail
-g.remove -f type=rast pattern=prec_1
+g.remove -f type=rast name=prec_1
t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
method=equal nprocs=5
Modified: grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
===================================================================
--- grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -185,7 +185,7 @@
else:
names += ",%s" % (map.get_name())
- grass.run_command("g.remove", flags='f', type='rast', pattern=names, quiet=True)
+ grass.run_command("g.remove", flags='f', type='rast', name=names, quiet=True)
dbif.close()
Modified: grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py
===================================================================
--- grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -144,8 +144,8 @@
count += 1
if use_granularity:
- grass.run_command("g.remove", flags='f', type='rast', pattern=null_map)
- grass.run_command("g.remove", flags='f', type='rast', pattern=map_name)
+ grass.run_command("g.remove", flags='f', type='rast', name=null_map)
+ grass.run_command("g.remove", flags='f', type='rast', name=map_name)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
===================================================================
--- grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -32,4 +32,4 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_sum,prec_max
t.remove type=strds input=precip_abs
-g.remove -f type=rast pattern=prec_sum,prec_max,prec_average
+g.remove -f type=rast name=prec_sum,prec_max,prec_average
Modified: grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -148,7 +148,7 @@
if ret != 0:
grass.fatal(_("Unable to create 3D raster map <%s>" % output))
- grass.run_command("g.remove", flags='f', type='rast', pattern=null_map)
+ grass.run_command("g.remove", flags='f', type='rast', name=null_map)
title = _("Space time voxel cube")
descr = _("This space time voxel cube was created with t.rast.to.rast3")
Modified: grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -71,4 +71,4 @@
t.unregister --v type=vect maps=lidar_abs_1:1,lidar_abs_1:2,lidar_abs_1:3,lidar_abs_1:4,lidar_abs_1:5,lidar_abs_1:6
t.remove type=stvds input=lidar_abs_ds1
-g.remove -f type=vect pattern=lidar_abs_1,lidar_abs_orig
+g.remove -f type=vect name=lidar_abs_1,lidar_abs_orig
Modified: grass/trunk/temporal/t.register/test.t.register.vector.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -63,6 +63,6 @@
t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
t.remove --v type=stvds input=lidar_abs_ds1,lidar_abs_ds2,lidar_abs_ds3,lidar_abs_ds4,lidar_abs_ds5,lidar_abs_ds6,lidar_abs_ds7
t.unregister --v type=vect maps=lidar_abs_4,lidar_abs_5,lidar_abs_6
-g.remove -f type=vect pattern=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
+g.remove -f type=vect name=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
Modified: grass/trunk/temporal/t.remove/t.remove.py
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.remove/t.remove.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -107,7 +107,7 @@
statement = ""
# Create the pygrass Module object for g.remove
- remove = pyg.Module("g.remove", quiet=True, run_=False)
+ remove = pyg.Module("g.remove", quiet=True, flags='f', run_=False)
for name in dataset_list:
name = name.strip()
@@ -132,7 +132,7 @@
# Delete every 100 maps
if count%100 == 0:
dbif.execute_transaction(map_statement)
- remove(type="rast", pattern=name_list, run_=True)
+ remove(type="rast", name=name_list, run_=True)
map_statement = ""
name_list = []
@@ -140,11 +140,11 @@
dbif.execute_transaction(map_statement)
if name_list:
if type == "strds":
- remove(type="rast", pattern=",".join(name_list), run_=True)
+ remove(type="rast", name=",".join(name_list), run_=True)
if type == "stvds":
- remove(type="vect", pattern=",".join(name_list), run_=True)
+ remove(type="vect", name=",".join(name_list), run_=True)
if type == "str3ds":
- remove(type="rast3d", pattern=",".join(name_list), run_=True)
+ remove(type="rast3d", name=",".join(name_list), run_=True)
statement += sp.delete(dbif=dbif, execute=False)
Modified: grass/trunk/temporal/t.rename/test.t.rename.sh
===================================================================
--- grass/trunk/temporal/t.rename/test.t.rename.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.rename/test.t.rename.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -49,4 +49,4 @@
t.remove --v type=strds input=precip_abs3,precip_abs4
t.unregister type=rast maps=prec_1,prec_2
-g.remove -f type=rast pattern=prec_1,prec_2
+g.remove -f type=rast name=prec_1,prec_2
Modified: grass/trunk/temporal/t.support/test.t.support.sh
===================================================================
--- grass/trunk/temporal/t.support/test.t.support.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.support/test.t.support.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -54,7 +54,7 @@
t.info type=strds input=precip_abs2
# Remove three maps
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3
+g.remove -f type=rast name=prec_1,prec_2,prec_3
# Booth space time datasets should be updated and 3 maps must have been unregistered
t.support --v -m type=strds input=precip_abs1
@@ -63,4 +63,4 @@
t.remove --v type=strds input=precip_abs1,precip_rel1
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=rast pattern=prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -39,6 +39,6 @@
t.remove type=stvds input=prec_observer
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove -f type=vect pattern=prec_observer,test_extract
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect name=prec_observer,test_extract
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -42,6 +42,6 @@
t.remove type=stvds input=prec_observer,test_extract_1,test_extract_2,test_extract_3
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove -f type=vect pattern=prec_observer
+g.remove -f type=vect name=prec_observer
g.remove -f type=vect pattern=test_*
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh
===================================================================
--- grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -44,5 +44,5 @@
# @postprocess
t.unregister type=vect maps=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
t.remove type=stvds input=soil_abs1,soil_abs2,soil_abs3
-g.remove -f type=vect pattern=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
-g.remove -f type=vect pattern=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
+g.remove -f type=vect name=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
+g.remove -f type=vect name=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
Modified: grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh
===================================================================
--- grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -59,7 +59,7 @@
# Cleaning up
rm -rf test
-g.remove -f type=vect pattern=soil_1,soil_2,soil_3
+g.remove -f type=vect name=soil_1,soil_2,soil_3
t.unregister type=vect file="${n1}"
t.remove type=stvds input=soil_abs1,soil_abs2
rm stvds_export_gml.tar.bz2
Modified: grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -121,4 +121,4 @@
t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
-g.remove -f type=vect pattern=soil_orig,soils
+g.remove -f type=vect name=soil_orig,soils
Modified: grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh
===================================================================
--- grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -106,4 +106,4 @@
#t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
#t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
-#g.remove -f type=vect pattern=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
+#g.remove -f type=vect name=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
Modified: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -36,5 +36,5 @@
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer
-#g.remove -f type=vect pattern=prec_observer
+#g.remove -f type=vect name=prec_observer
#g.remove -f type=rast pattern=test_prec_*
Modified: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -31,5 +31,5 @@
t.remove type=stvds input=prec_observer
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-#g.remove -f type=vect pattern=prec_observer,test_extract
-#g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+#g.remove -f type=vect name=prec_observer,test_extract
+#g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
===================================================================
--- grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -27,5 +27,5 @@
# @postprocess
t.unregister type=vect maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
t.remove type=stvds input=random_data
-g.remove -f type=vect pattern=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+g.remove -f type=vect name=rpoints1,rpoints2,rvoronoi1,rvoronoi2
Modified: grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -185,7 +185,7 @@
if aggreagated_map_name:
ret = grass.run_command("g.remove", flags='f', type=rast,
- pattern=aggreagated_map_name)
+ name=aggreagated_map_name)
if ret != 0:
dbif.close()
grass.fatal(_("Unable to remove raster map <%s>")
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -77,5 +77,5 @@
t.unregister type=rast maps=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
t.remove type=strds input=sand_frac_abs_1,sand_frac_abs_2
-g.remove -f type=rast pattern=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
-g.remove -f type=vect pattern=soils,soil_orig
+g.remove -f type=rast name=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
+g.remove -f type=vect name=soils,soil_orig
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -54,5 +54,5 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=vect pattern=soil_1,soil_2,soil_3
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect name=soil_1,soil_2,soil_3
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -55,5 +55,5 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_rel1
-g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove -f type=vect pattern=soil_1,soil_2,soil_3
+g.remove -f type=rast name=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect name=soil_1,soil_2,soil_3
Modified: grass/trunk/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/trunk/testsuite/raster/raster_md5test.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/testsuite/raster/raster_md5test.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -48,7 +48,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove -f type=rast pattern=$TMPNAME > /dev/null
+ g.remove -f type=rast name=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -64,11 +64,11 @@
{
echo "Restoring user region"
g.region region=$TMPNAME
- g.remove -f type=region pattern=$TMPNAME > /dev/null
+ g.remove -f type=region name=$TMPNAME > /dev/null
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove -f type=rast pattern=MASK > /dev/null
+ g.remove -f type=rast name=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/testsuite/raster/rhemisphere.sh
===================================================================
--- grass/trunk/testsuite/raster/rhemisphere.sh 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/testsuite/raster/rhemisphere.sh 2014-10-27 17:10:46 UTC (rev 62421)
@@ -24,7 +24,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove --q -f type=rast pattern=$TMP > /dev/null
+ g.remove --q -f type=rast name=$TMP > /dev/null
}
########################
Modified: grass/trunk/tools/thumbnails.py
===================================================================
--- grass/trunk/tools/thumbnails.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/tools/thumbnails.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -31,10 +31,10 @@
grass.try_remove(tmp_img)
if tmp_grad_rel:
grass.run_command('g.remove', flags = 'f', type = 'rast',
- pattern = tmp_grad_rel, quiet = True)
+ name = tmp_grad_rel, quiet = True)
if tmp_grad_abs:
grass.run_command('g.remove', flags = 'f', type = 'rast',
- pattern = tmp_grad_abs, quiet = True)
+ name = tmp_grad_abs, quiet = True)
# def rotate(src, dst):
# grass.call(["convert", "-rotate", "90", src, dst])
Modified: grass/trunk/vector/v.distance/v.distance.html
===================================================================
--- grass/trunk/vector/v.distance/v.distance.html 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/vector/v.distance/v.distance.html 2014-10-27 17:10:46 UTC (rev 62421)
@@ -149,7 +149,7 @@
# we need to give the lines category numbers, create a table, and create
# a column in that table to hold the distance data.
v.category vdistance_vectors_raw out=vdistance_vectors type=line op=add
-g.remove -f type=vect pattern=vdistance_vectors_raw
+g.remove -f type=vect name=vdistance_vectors_raw
v.db.addtable map=vdistance_vectors column="length DOUBLE"
v.to.db map=vdistance_vectors option=length column=length
Modified: grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-10-27 17:10:46 UTC (rev 62421)
@@ -43,7 +43,7 @@
# vector line needs to be polyline
v.build.polylines busroute_tmp2 out=busroute_tmp3
v.category busroute_tmp3 out=busroute op=add
-g.remove -f type=vect pattern=busroute_tmp,busroute_tmp2,busroute_tmp3
+g.remove -f type=vect name=busroute_tmp,busroute_tmp2,busroute_tmp3
</pre></div>
The result can be visualized:
Modified: grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py
===================================================================
--- grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py 2014-10-27 16:39:03 UTC (rev 62420)
+++ grass/trunk/vector/v.what/testsuite/test_vwhat_layers.py 2014-10-27 17:10:46 UTC (rev 62421)
@@ -125,7 +125,7 @@
@classmethod
def tearDownClass(cls):
- cls.runModule('g.remove', type='vect', names='test_vector', flags='f')
+ cls.runModule('g.remove', type='vect', name='test_vector', flags='f')
def setUp(self):
self.vwhat = SimpleModule('v.what', map='test_vector',
More information about the grass-commit
mailing list