Rename g.remove's names= to name= and use name= instead of pattern= as needed

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@62421 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.remove/g.remove.html

@@ -10,7 +10,7 @@ printed to <tt>stdout</tt> as a preview of the files to be deleted.
 
 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

gui/wxpython/gmodeler/frame.py

@@ -327,13 +327,13 @@ class ModelFrame(wx.Frame):
             
             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)))

gui/wxpython/gmodeler/model.py

@@ -709,11 +709,11 @@ class Model(object):
         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 @@ def cleanup():
         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')

gui/wxpython/iclass/frame.py

@@ -256,7 +256,7 @@ class IClassMapFrame(DoubleMapFrame):
                          parent = self,
                          flags = 'f',
                          type = 'vect',
-                         pattern = self.trainingAreaVector)
+                         name = self.trainingAreaVector)
         if ret != 0:
             return False
         return True
@@ -269,7 +269,7 @@ class IClassMapFrame(DoubleMapFrame):
                          parent = self,
                          flags = 'f',
                          type = 'rast',
-                         pattern = raster)
+                         name = raster)
         if ret != 0:
             return False
         return True

gui/wxpython/iscatt/iscatt_core.py

@@ -284,7 +284,7 @@ class CatRastUpdater:
             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 @@ class ScattPlotsData(ScattPlotsCondsData):
         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 @@ class ScattPlotsData(ScattPlotsCondsData):
             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 = {}

gui/wxpython/lmgr/datacatalog.py

@@ -416,17 +416,17 @@ class DataCatalogTree(LocationMapTree):
                 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()
             

gui/wxpython/mapdisp/frame.py

@@ -694,7 +694,7 @@ class MapFrame(SingleMapFrame):
                                           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)

gui/wxpython/rlisetup/functions.py

@@ -86,7 +86,7 @@ def convertFeature(vect, outrast, cat, origrast):
     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):

gui/wxpython/rlisetup/sampling_frame.py

@@ -263,8 +263,8 @@ class RLiSetupMapPanel(wx.Panel):
 
         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

gui/wxpython/vnet/vnet_core.py

@@ -122,7 +122,7 @@ class VNETManager:
         # 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)

gui/wxpython/vnet/vnet_data.py

@@ -939,7 +939,7 @@ class VNETTmpVectMaps:
         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 @@ class VNETTmpVectMaps:
         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

lib/gpde/test/test_arrays.c

@@ -294,7 +294,7 @@ int io_bench_2d(void)
 
 
     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 @@ int test_array_2d(void)
 
 
     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 @@ int test_array_3d(void)
     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);

lib/python/gunittest/case.py

@@ -122,7 +122,7 @@ class TestCase(unittest.TestCase):
                                "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 @@ class TestCase(unittest.TestCase):
                                           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 @@ class TestCase(unittest.TestCase):
             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 @@ class TestCase(unittest.TestCase):
                                           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 @@ class TestCase(unittest.TestCase):
             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 @@ class TestCase(unittest.TestCase):
                                             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 @@ class TestCase(unittest.TestCase):
                     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 @@ class TestCase(unittest.TestCase):
             # 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,

lib/python/gunittest/testsuite/test_assertions_rast3d.py

@@ -30,7 +30,7 @@ class TestRaster3dMapAssertions(gunittest.TestCase):
         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,

lib/python/gunittest/testsuite/test_assertions_vect.py

@@ -139,7 +139,7 @@ class TestVectorGeometryAssertions(gunittest.TestCase):
         # 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."""

lib/python/pygrass/modules/grid/grid.py

@@ -250,7 +250,7 @@ def copy_rasters(rasters, gisrc_src, gisrc_dst, region=None):
         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 @@ def copy_vectors(vectors, gisrc_src, gisrc_dst):
         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)

lib/python/pygrass/raster/testsuite/test_raster.py

@@ -21,7 +21,7 @@ class RasterRowTestCate(TestCase):
     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)

lib/python/pygrass/utils.py

@@ -92,7 +92,7 @@ def findmaps(type, pattern=None, mapset='', location='', gisdbase=''):
 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):

lib/python/pygrass/vector/testsuite/test_vector3d.py

@@ -61,7 +61,7 @@ class VectorTopo3DTestCase(TestCase):
         """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__':

lib/python/script/core.py

@@ -1017,7 +1017,7 @@ def del_temp_region():
     """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
 

lib/python/script/db.py

@@ -31,7 +31,7 @@ def db_describe(table, **args):
     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 @@ def db_table_exist(table, **args):
     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 @@ def db_select(sql=None, filename=None, table=None, **args):
 
     >>> 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 @@ def db_table_in_vector(table):
     >>> db_table_in_vector('myfirestations')
     ['myfirestations@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

lib/python/script/raster.py

@@ -119,7 +119,7 @@ def mapcalc_start(exp, quiet=False, verbose=False, overwrite=False,
     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>)

lib/python/script/raster3d.py

@@ -32,7 +32,7 @@ def raster3d_info(map):
     >>> 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

lib/python/temporal/aggregation.py

@@ -170,7 +170,7 @@ def aggregate_raster_maps(inputs, base, start, end, count, method,
        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

lib/python/temporal/extract.py

@@ -234,13 +234,13 @@ def extract_dataset(input, output, type, where, expression, base, nprocs=1,
                 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()
 

lib/python/temporal/mapcalc.py

@@ -328,10 +328,10 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
                 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()
 

lib/python/temporal/register.py

@@ -488,7 +488,7 @@ def register_map_object_list(type,  map_list, output_stds,
             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:

lib/python/temporal/space_time_datasets.py

@@ -100,7 +100,7 @@ class RasterDataset(AbstractMapDataset):
             >>> 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 @@ class Raster3DDataset(AbstractMapDataset):
             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 @@ class VectorDataset(AbstractMapDataset):
             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()
 

lib/python/temporal/temporal_raster3d_algebra.py

@@ -53,7 +53,7 @@ class TemporalRaster3DAlgebraParser(TemporalRasterBaseAlgebraParser):
                 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()
 

lib/python/temporal/temporal_raster_algebra.py

@@ -94,7 +94,7 @@ class TemporalRasterAlgebraParser(TemporalRasterBaseAlgebraParser):
                 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()
 

lib/python/temporal/temporal_vector_algebra.py

@@ -519,12 +519,12 @@ class TemporalVectorAlgebraParser(TemporalAlgebraParser):
             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()
 

lib/python/temporal/testsuite/test_register_function.py

@@ -52,7 +52,7 @@ class TestRegisterFunctions(grass.gunittest.TestCase):
         """!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()
 

raster/r.category/test_rcategory_doctest.txt

@@ -231,9 +231,9 @@ This is useful when test is runned in location which is not deleted
 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

raster/r.li/r.li.setup/masked_area_selection.sh

@@ -104,7 +104,7 @@ cleanup()
    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 @@ if [ "$ok" -eq 1 ] ; then
 	    "$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" \

raster/r.li/r.li.setup/r.li.setup

@@ -33,7 +33,7 @@ cleanup()
    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

raster/r.li/r.li.setup/sample_area_vector.sh

@@ -71,7 +71,7 @@ cleanup()
    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 @@ while read CAT ; do
 	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"
 

raster/r.li/r.li.setup/square_mouse_selection.sh

@@ -90,7 +90,7 @@ cleanup()
    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"

raster/r.mapcalc/testsuite/const_map_test.sh

@@ -43,7 +43,7 @@ TMPNAME="`echo ${PID}_tmp_testmap | sed 's+\.+_+g'`"
 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 @@ finalcleanup()
 {
  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
 }

raster/r.mapcalc/testsuite/test_r3_mapcalc.py

@@ -22,7 +22,7 @@ class TestBasicOperations(grass.gunittest.TestCase):
         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"""

raster/r.mapcalc/testsuite/test_r_mapcalc.py

@@ -74,7 +74,7 @@ class TestRandFunction(grass.gunittest.TestCase):
         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 @@ class TestBasicOperations(grass.gunittest.TestCase):
         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"""

raster/r.slope.aspect/testsuite/test_r_slope_aspect.py

@@ -68,7 +68,7 @@ class TestSlopeAspectAgainstReference(grass.gunittest.TestCase):
     @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'

raster/r.viewshed/testsuite/test_r_viewshed.py

@@ -19,7 +19,7 @@ class TestViewshed(grass.gunittest.TestCase):
         """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 @@ class TestViewshedAgainstReference(grass.gunittest.TestCase):
     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'

raster/r.watershed/front/r.watershed.html

@@ -422,7 +422,7 @@ cut-off value. This only works with SFD, not with MFD.
        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

raster/simwe/r.sim.water/spearfish.sh

@@ -57,5 +57,5 @@ echo "Now open paraview from this command line and load the vtk files as time se
 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

raster3d/r3.flow/testsuite/r3flow_test.py

@@ -54,8 +54,8 @@ class FlowlineTest(TestCase):
     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):

raster3d/r3.gradient/testsuite/r3gradient_test.py

@@ -115,7 +115,7 @@ class GradientTest(TestCase):
         """!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']))

raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh

@@ -31,4 +31,4 @@ r3.out.netcdf --o -p null=-1000 input=volume_time_float output=test_time_float.n
 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

scripts/d.rast.edit/d.rast.edit.py

@@ -495,7 +495,7 @@ class Application(wx.App):
 
     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 @@ class Application(wx.App):
 	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 @@ class Application(wx.App):
 	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)

scripts/d.shadedmap/d.shadedmap.py

@@ -61,7 +61,7 @@ def main():
         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,

scripts/db.in.ogr/db.in.ogr.py

@@ -108,7 +108,7 @@ def main():
     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+')

scripts/i.in.spotvgt/i.in.spotvgt.py

@@ -177,7 +177,7 @@ def main():
     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:

scripts/i.pansharpen/i.pansharpen.py

@@ -176,7 +176,7 @@ def main():
 
         # 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 @@ def main():
 
         # 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 @@ def matchhist(original, target, matched):
     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)

scripts/r.buffer.lowmem/r.buffer.lowmem.py

@@ -58,9 +58,9 @@ scales = {
 # 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

scripts/r.colors.stddev/r.colors.stddev.py

@@ -41,7 +41,7 @@ def z(n):
 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

scripts/r.fillnulls/r.fillnulls.py

@@ -100,9 +100,9 @@ mapset = None
 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 @@ def main():
                 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 @@ def main():
                 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

scripts/r.grow/r.grow.py

@@ -69,7 +69,7 @@ def cleanup():
     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

scripts/r.in.wms/wms_base.py

@@ -466,7 +466,7 @@ class GRASSImporter:
                                   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():

scripts/r.mask/r.mask.py

@@ -74,10 +74,10 @@ import atexit
 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 @@ def main():
         # -> 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 @@ def main():
             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

scripts/r.reclass.area/r.reclass.area.py

@@ -229,10 +229,10 @@ def cleanup():
     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__":

scripts/r.unpack/test_suite/test.r.unpack.sh

@@ -21,7 +21,7 @@ r.pack --o --v -c input=test_float  output=test_float_uncompressed.pack
 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.unpack -o --v -o input=test_double_uncompressed.pack output=test_double_uncomp
 #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

scripts/v.dissolve/v.dissolve.py

@@ -40,7 +40,7 @@ import grass.script as grass
 
 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

scripts/v.out.gps/v.out.gps.py

@@ -100,11 +100,11 @@ def cleanup():
     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

scripts/v.rast.stats/v.rast.stats.py

@@ -70,9 +70,9 @@ import grass.script as grass
 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 @@ def main():
                                  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) +

scripts/v.to.lines/v.to.lines.py

@@ -90,25 +90,25 @@ def main():
                               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 @@ def main():
                                   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 @@ def main():
                               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()

scripts/v.unpack/test_suite/test.v.unpack.sh

@@ -19,7 +19,7 @@ db.copy from_table=probe_orig to_table=probe_3_2
 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_2 output=probe_2_uncompressed.pack
 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.category input=probe_2_uncompressed option=report
 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

scripts/v.unpack/v.unpack.py

@@ -91,7 +91,7 @@ def main():
     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

temporal/t.merge/testsuite/test.t.merge.sh

@@ -49,4 +49,4 @@ t.rast.list precip_abs4
 
 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

temporal/t.rast.accdetect/t.rast.accdetect.py

@@ -418,7 +418,7 @@ def main():
     # 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)
 
 ############################################################################
 

temporal/t.rast.accumulate/t.rast.accumulate.py

@@ -500,7 +500,7 @@ def main():
     # 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()

temporal/t.rast.gapfill/test.t.rast.gapfill.sh

@@ -31,4 +31,4 @@ t.info type=rast input=prec_7
 
 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

temporal/t.rast.import/test.t.rast.import.relative.sh

@@ -75,7 +75,7 @@ r.info prec_1
 # 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

temporal/t.rast.import/test.t.rast.import.sh

@@ -74,7 +74,7 @@ r.info prec_1
 # 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

temporal/t.rast.import/test.t.rast.import_locations.sh

@@ -59,7 +59,7 @@ ls -la $GISDBASE/new_test_4/PERMANENT
 
 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

temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh

@@ -47,7 +47,7 @@ t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
 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

temporal/t.rast.neighbors/t.rast.neighbors.py

@@ -185,7 +185,7 @@ def main():
             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()
 

temporal/t.rast.out.vtk/t.rast.out.vtk.py

@@ -144,8 +144,8 @@ def main():
             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()

temporal/t.rast.series/test.t.rast.series.sh

@@ -32,4 +32,4 @@ r.info prec_sum
 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

temporal/t.rast.to.rast3/t.rast.to.rast3.py

@@ -148,7 +148,7 @@ def main():
         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")

temporal/t.register/test.t.register.vector.file.layer.sh

@@ -71,4 +71,4 @@ t.list type=vect columns=id,name,start_time,end_time where="name='lidar_abs_1'"
 
 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

temporal/t.register/test.t.register.vector.sh

@@ -63,6 +63,6 @@ t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
 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
 
 

temporal/t.remove/t.remove.py

@@ -107,7 +107,7 @@ def main():
     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 @@ def main():
                 # 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 @@ def main():
                 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)
 

temporal/t.rename/test.t.rename.sh

@@ -49,4 +49,4 @@ t.rename type=strds input=precip_abs4 output=precip_abs3
 
 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

temporal/t.support/test.t.support.sh

@@ -54,7 +54,7 @@ t.support --v -m type=strds input=precip_abs2
 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.info type=strds input=precip_abs2
 
 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

temporal/t.vect.db.select/test.t.vect.db.select.sh

@@ -39,6 +39,6 @@ t.remove type=strds input=precip_abs1
 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
 

temporal/t.vect.extract/test.t.vect.extract.layer.sh

@@ -42,6 +42,6 @@ t.remove type=strds input=precip_abs1
 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

temporal/t.vect.extract/test.t.vect.extract.sh

@@ -44,5 +44,5 @@ t.vect.list input=soil_abs3 columns=name,start_time,end_time,primitives
 # @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

temporal/t.vect.import/testsuite/test.t.vect.import.sh

@@ -59,7 +59,7 @@ v.info soil_1
 
 # 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

temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh

@@ -121,4 +121,4 @@ t.vect.list separator=" | " method=deltagaps input=soils_abs5
 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

temporal/t.vect.list/testsuite/test.t.vect.list.sh

@@ -106,4 +106,4 @@ t.vect.list separator=" | " method=deltagaps input=lidar_abs5
 
 #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

temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh

@@ -36,5 +36,5 @@ t.unregister type=rast file=${MAP_LIST}
 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_*

temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh

@@ -31,5 +31,5 @@ t.remove type=strds input=precip_abs1
 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

temporal/t.vect.univar/testsuite/test.t.vect.univar.sh

@@ -27,5 +27,5 @@ t.vect.univar type=line input=random_data column=height where='height > 20' twhe
 # @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
 

temporal/t.vect.what.strds/t.vect.what.strds.py

@@ -185,7 +185,7 @@ def main():
 
                 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>")

temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh

@@ -77,5 +77,5 @@ t.remove type=stvds input=soil_abs
 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

temporal/t.vect.what.strds/test.t.vect.what.strds.sh

@@ -54,5 +54,5 @@ t.remove type=stvds input=soil_abs1
 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

temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh

@@ -55,5 +55,5 @@ t.remove type=stvds input=soil_rel1
 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

testsuite/raster/raster_md5test.sh

@@ -48,7 +48,7 @@ TMPNAME="`echo ${PID}_tmp_testmap | sed 's+\.+_+g'`"
 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 @@ finalcleanup()
 {
  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
 }

testsuite/raster/rhemisphere.sh

@@ -24,7 +24,7 @@ TMP="disk.$$"
 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
 }
 
 ########################

tools/thumbnails.py

@@ -31,10 +31,10 @@ def cleanup():
         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])