update g.region/g.rename calls to use new element names (https://trac.osgeo.org/grass/ticket/2409) (trunk, https://trac.osgeo.org/grass/changeset/63644)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63649 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gmodeler/frame.py

@@ -326,13 +326,13 @@ class ModelFrame(wx.Frame):
             dlg.Destroy()
             
             if rast:
-                self._gconsole.RunCmd(['g.remove', '-f', 'type=rast',
+                self._gconsole.RunCmd(['g.remove', '-f', 'type=raster',
                                        'name=%s' %','.join(rast)])
             if rast3d:
-                self._gconsole.RunCmd(['g.remove', '-f', 'type=rast3d',
+                self._gconsole.RunCmd(['g.remove', '-f', 'type=raster_3d',
                                        'name=%s' %','.join(rast3d)])
             if vect:
-                self._gconsole.RunCmd(['g.remove', '-f', 'type=vect',
+                self._gconsole.RunCmd(['g.remove', '-f', 'type=vector',
                                        'name=%s' %','.join(vect)])
             
             self.SetStatusText(_("%d maps deleted from current mapset") % \
@@ -786,7 +786,7 @@ class ModelFrame(wx.Frame):
             x = width/2 - 200 + self._randomShift()
             y = height/2 + self._randomShift()
             for p in params['params']:
-                if p.get('prompt', '') in ('raster', 'vector', 'raster3d') and \
+                if p.get('prompt', '') in ('raster', 'vector', 'raster_3d') and \
                         (p.get('value', None) or \
                              (p.get('age', 'old') != 'old' and p.get('required', 'no') == 'yes')):
                     data = layer.FindData(p.get('name', ''))

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', 'name=%s' %','.join(rast)])
+            log.RunCmd(['g.remove', '-f', 'type=raster', 'name=%s' %','.join(rast)])
         if rast3d:
-            log.RunCmd(['g.remove', '-f', 'type=rast3d', 'name=%s' %','.join(rast3d)])
+            log.RunCmd(['g.remove', '-f', 'type=raster_3d', 'name=%s' %','.join(rast3d)])
         if vect:
-            log.RunCmd(['g.remove', '-f', 'type=vect', 'name=%s' %','.join(vect)])
+            log.RunCmd(['g.remove', '-f', 'type=vector', 'name=%s' %','.join(vect)])
         
     def GetIntermediateData(self):
         """Get info about intermediate data"""

lib/python/script/db.py

@@ -32,7 +32,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', name='myfirestations')
+    >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
     0
 
     :param str table: table name
@@ -72,7 +72,7 @@ def db_table_exist(table, **args):
     0
     >>> db_table_exist('myfirestations')
     True
-    >>> run_command('g.remove', flags='f', type='vect', name='myfirestations')
+    >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
     0
 
     :param str table: table name
@@ -130,7 +130,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', name='myfirestations')
+    >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
     0
 
     :param str sql: SQL statement to perform (or None)
@@ -176,7 +176,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', name='myfirestations')
+    >>> run_command('g.remove', flags='f', type='vector', name='myfirestations')
     0
 
     :param str table: name of table to query

lib/python/temporal/aggregation.py

@@ -171,7 +171,7 @@ def aggregate_raster_maps(inputs, base, start, end, count, method,
     if new_map.metadata.get_min() is None and \
        new_map.metadata.get_max() is None:
         if not register_null:
-            gscript.run_command("g.remove", flags='f', type='rast',
+            gscript.run_command("g.remove", flags='f', type='raster',
                                 name=output)
             return None
 

raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh

@@ -124,7 +124,7 @@ r3.in.bin --o output=test_in_bin_float_13 byte=4 null=-9999 \
     bottom=0 top=100 west=0 east=180 south=0 north=90 \
     cols=18 rows=9 depths=10
 
-for map in `g.list type=raster3d pattern=test_in_bin_float*` ; do
+for map in `g.list type=raster_3d pattern=test_in_bin_float*` ; do
   r3.out.ascii input=${map} output=${map}.txt precision=0
 done
 
@@ -132,7 +132,7 @@ for i in `ls test_in_bin_float_*.txt` ; do
     diff $i test_out_bin_float.ref
 done
 
-g.remove -f type=raster3d pattern=test_in*
-g.remove -f type=raster3d pattern=test_out*
+g.remove -f type=raster_3d pattern=test_in*
+g.remove -f type=raster_3d pattern=test_out*
 rm test_in_*.txt
 rm test_out_*.bin

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 name=volume_float,volume_double,volume_time_double,volume_time_float
+g.remove -f type=raster_3d 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', name = self.tempmap)
+	run('g.remove', flags = 'f', type = 'raster', name = self.tempmap)
 
     def finalize(self):
 	self.save_map()
@@ -529,7 +529,7 @@ class Application(wx.App):
 	run('g.region', raster = 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', name = self.tempmap)
+	run('g.remove', flags = 'f', type = 'raster', 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', name = self.tempmap)
+	run('g.remove', flags = 'f', type = 'raster', name = self.tempmap)
 
 	tempimg = wx.Image(self.tempfile)
 	grass.try_remove(self.tempfile)

scripts/d.rast.leg/d.rast.leg.py

@@ -155,7 +155,7 @@ def main():
 #        lflags += 'n'
 
     make_frame(f, 0, 90, 70, 100)
-    grass.run_command('d.legend', flags = lflags, rast = lmap, lines = nlines, at = leg_at)
+    grass.run_command('d.legend', flags = lflags, raster = lmap, lines = nlines, at = leg_at)
 
     #draw map
     make_frame(f, 0, 100, 0, 70)

scripts/d.shade/d.shade.py

@@ -47,15 +47,6 @@ from grass.exceptions import CalledModuleError
 def main():
     options, unused = gcore.parser()
 
-    env = gcore.gisenv()
-    mon = env.get('MONITOR', None)
-    if not mon:
-        # os is needed only here
-        import os
-        if not 'GRASS_RENDER_IMMEDIATE' in os.environ:
-            gcore.fatal(_("No graphics device selected."
-                          " Use d.mon to select graphics device."))
-
     drape_map = options['drapemap']
     relief_map = options['reliefmap']
     brighten = options['brighten']

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

@@ -107,7 +107,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', quiet = True, flags = 'f', type = 'vect', name = output)
+	grass.run_command('g.remove', flags = 'f', quiet = True, type = 'vector', 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

@@ -180,7 +180,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', type = 'rast', name = name, quiet = True, flags = 'f')
+    grass.run_command('g.remove', type = 'raster', name = name, quiet = True, flags = 'f')
     grass.run_command('g.rename', raster = (tmpname, name), quiet = True)
 
     # write cmd history:

scripts/i.pansharpen/i.pansharpen.py

@@ -175,7 +175,7 @@ def main():
             pr.wait()
 
         # Cleanup
-        grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+        grass.run_command('g.remove', flags='f', quiet=True, type='raster',
                           name='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
 
     elif sharpen == "ihs":
@@ -206,7 +206,7 @@ def main():
                           blue="%s_blue" % out)
 
         # Cleanup
-        grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+        grass.run_command('g.remove', flags='f', quiet=True, type='raster',
                           name=panmatch)
 
     elif sharpen == "pca":
@@ -307,7 +307,7 @@ def main():
             pb.wait()
 
         # Cleanup
-        grass.run_command('g.remove', flags='f', quiet=True, type="rast",
+        grass.run_command('g.remove', flags='f', quiet=True, type="raster",
                           pattern='tmp%s*,%s' % (pid, panmatch))
 
     # Could add other sharpening algorithms here, e.g. wavelet transformation
@@ -349,7 +349,7 @@ def main():
                       input="{n}_red,{n}_blue,{n}_green".format(n=out))
 
     # Cleanup
-    grass.run_command('g.remove', flags="f", type="rast",
+    grass.run_command('g.remove', flags="f", type="raster",
                       pattern="tmp%s*" % pid, quiet=True)
 
 
@@ -432,7 +432,7 @@ def matchhist(original, target, matched):
     # create reclass of target from reclass rules file
     result = grass.core.find_file(matched, element='cell')
     if result['fullname']:
-        grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+        grass.run_command('g.remove', flags='f', quiet=True, type='raster',
                           name=matched)
         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 = 'bf', type = 'rast', name = temp_src)
+        grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = temp_src)
     if grass.find_file(temp_dist)['file']:
-        grass.run_command('g.remove', quiet = True, flags = 'bf', type = 'rast', name = temp_dist)
+        grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = temp_dist)
 
 def main():
     global temp_dist, temp_src

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

@@ -40,7 +40,8 @@ def z(n):
 
 def cleanup():
     if tmpmap:
-	grass.run_command('g.remove', type='rast', name=tmpmap, quiet=True, flags='f')
+	grass.run_command('g.remove', flags = 'f', type = 'raster',
+                      name = tmpmap, quiet = True)
 
 def main():
     global tmpmap

scripts/r.fillnulls/r.fillnulls.py

@@ -101,9 +101,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='bf', type='vect', name=tmp_vmaps)
+        grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'vector', name = tmp_vmaps)
     if len(tmp_rmaps) > 0:
-        grass.run_command('g.remove', quiet=True, flags='bf', type='rast', name=tmp_rmaps)
+        grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'raster', name = tmp_rmaps)
     if usermask and mapset:
         if grass.find_file(usermask, mapset = mapset)['file']:
             grass.run_command('g.rename', quiet = True, raster = (usermask, 'MASK'), overwrite = True)
@@ -253,7 +253,7 @@ def main():
             
             # remove temporary map to not overfill disk
             try:
-                grass.run_command('g.remove', flags='fb', type='vect',
+                grass.run_command('g.remove', flags='fb', type='vector',
                                   name=holename + '_pol', quiet=quiet)
             except CalledModuleError:
                 grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
@@ -360,7 +360,7 @@ def main():
                 pass
             try:
                 grass.run_command('g.remove', quiet=quiet,
-                                  flags='fb', type='rast',
+                                  flags='fb', type='raster',
                                   name=(holename,
                                         holename + '_grown',
                                         holename + '_edges',
@@ -373,7 +373,7 @@ def main():
                 pass
             try:
                 grass.run_command('g.remove', quiet=quiet, flags='fb',
-                                  type='vect', name=holename)
+                                  type='vector', name=holename)
             except CalledModuleError:
                 grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
     

scripts/r.grow/r.grow.py

@@ -70,7 +70,8 @@ from grass.exceptions import CalledModuleError
 def cleanup():
     for map in [temp_dist, temp_val]:
         if map:
-            grass.run_command('g.remove', quiet=True, flags='bf', type='rast', name=map)
+            grass.run_command('g.remove', flags = 'fb', quiet = True,
+                              type='rast', name = map)
 
 def main():
     global temp_dist, temp_val

scripts/r.in.wms/wms_base.py

@@ -467,9 +467,9 @@ class GRASSImporter:
             if maps:
                 grass.run_command('g.remove',
                                   quiet = True,
-                                  flags = 'bf',
+                                  flags = 'fb',
                                   type = 'rast',
-                                  name  = ','.join(maps))
+                                  name = ','.join(maps))
         
         # delete environmental variable which overrides region 
         if 'GRASS_REGION' in os.environ.keys():

scripts/r.mask/r.mask.py

@@ -75,9 +75,11 @@ from grass.exceptions import CalledModuleError
 
 def cleanup():
     if tmp:
-        grass.run_command('g.remove', type='rast', name=tmp, quiet=True, flags='f')
+        grass.run_command('g.remove', flags = 'f', type = 'raster',
+                          name = tmp, quiet = True)
     if tmp_hull:
-        grass.run_command('g.remove', type='vect', name=tmp_hull, quiet=True, flags='f')
+        grass.run_command('g.remove', flags = 'f', type = 'vector',
+                          name = tmp_hull, quiet = True)
 
 def main():
     raster = options['raster']
@@ -98,7 +100,8 @@ def main():
     if remove:
         # -> remove
         if exists:
-            grass.run_command('g.remove', quiet=True, type='rast', name='MASK', flags='f')
+            grass.run_command('g.remove', flags = 'f', quiet = True,
+                              type = 'raster', name = 'MASK')
             grass.message(_("Raster MASK removed"))
         else:
             grass.fatal(_("No existing MASK to remove"))
@@ -109,7 +112,8 @@ def main():
                 grass.fatal(_("MASK already found in current mapset. Delete first or overwrite."))
             else:
                 grass.warning(_("MASK already exists and will be overwritten"))
-                grass.run_command('g.remove', quiet=True, type='rast', name='MASK', flags='f')
+                grass.run_command('g.remove', flags = 'f', quiet = True,
+                                  type = 'raster', name = 'MASK')
         
         if raster:
             # check if input raster exists

scripts/r.out.xyz/r.out.xyz.py

@@ -4,12 +4,12 @@
 # MODULE:       r.out.xyz
 # AUTHOR:       M. Hamish Bowman, Dept. Marine Science, Otago Univeristy,
 #                 New Zealand
-#		Converted to Python by Glynn Clements
+#               Converted to Python by Glynn Clements
 # PURPOSE:      Export a raster map as x,y,z values based on cell centers
 #               This is a simple wrapper script for "r.stats -1ng"
 #
 # COPYRIGHT:    (c) 2006 Hamish Bowman, and the GRASS Development Team
-#		(c) 2008 Glynn Clements, and the GRASS Development Team
+#               (c) 2008 Glynn Clements, and the GRASS Development Team
 #               This program is free software under the GNU General Public
 #               License (>=v2). Read the file COPYING that comes with GRASS
 #               for details.
@@ -40,15 +40,12 @@ from grass.exceptions import CalledModuleError
 def main():
     # if no output filename, output to stdout
     output = options['output']
-    sep = options['separator']
 
     parameters = dict(flags="1gn",
-                      input=options['input'])
+                      input=options['input'],
+                      separator=options['separator'])
     if output:
         parameters.update(output=output)
-    # windows don't like pipe so we don't include it in the command explicitly
-    if sep != '|':
-        parameters.update(separator=sep)
 
     ret = 0
     try:

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

@@ -221,10 +221,10 @@ def cleanup():
     TMPRAST.reverse()  # reclassed map first
     for mapp in TMPRAST:
         if method == 'rmarea':
-            grass.run_command("g.remove", flags='f', type='vect', name=mapp,
+            grass.run_command("g.remove", flags='f', type='vector', name=mapp,
                               quiet=True)
         else:
-            grass.run_command("g.remove", flags='f', type='rast', name=mapp,
+            grass.run_command("g.remove", flags='f', type='raster', 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 name=test_int,test_float,test_double
+g.remove -f type=raster 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 name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
+g.remove -f type=raster name=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
 rm *.pack

scripts/v.dissolve/v.dissolve.py

@@ -43,7 +43,7 @@ from grass.exceptions import CalledModuleError
 
 def cleanup():
     nuldev = file(os.devnull, 'w')
-    grass.run_command('g.remove', type='vect', name='%s_%s' % (output, tmp), quiet=True, flags='f', stderr=nuldev)
+    grass.run_command('g.remove', flags = 'f', type = 'vector', name = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
 
 def main():
     global output, tmp

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

@@ -100,10 +100,12 @@ def cleanup():
     # only try to remove map if it exists to avoid ugly warnings
     if tmp_vogb:
 	if grass.find_file(tmp_vogb, element = 'vector')['name']:
-	    grass.run_command('g.remove', type='vect', name=tmp_vogb, quiet=True, flags='f')
+	    grass.run_command('g.remove', flags = 'f', type = 'vector',
+                          name = tmp_vogb, quiet = True)
     if tmp_extr:
 	if grass.find_file(tmp_extr, element = 'vector')['name']:
-	    grass.run_command('g.remove', type='vect', name=tmp_vogb, quiet=True, flags='f')
+	    grass.run_command('g.remove', flags = 'f', type = 'vector',
+                          name = tmp_vogb, quiet = True)
 
 tmp = None
 tmp_proj = None

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

@@ -70,8 +70,10 @@ from grass.exceptions import CalledModuleError
 
 def cleanup():
     if rastertmp:
-        grass.run_command('g.remove', type='rast', name=rastertmp, quiet=True, flags='f')
-    grass.run_command('g.remove', type='rast', name='MASK', quiet=True, flags='f', stderr=nuldev)
+        grass.run_command('g.remove', flags='f', type='raster',
+                          name=rastertmp, quiet=True)
+    grass.run_command('g.remove', flags='f', type='raster',
+                      name='MASK', quiet=True, stderr=nuldev)
     if mask_found:
         grass.message(_("Restoring previous MASK..."))
         grass.run_command('g.rename', raster=(tmpname + "_origmask", 'MASK'),
@@ -293,7 +295,7 @@ def main():
         grass.warning(_("Failed to upload statistics to attribute table of vector map <%s>.") % vector)
         exitcode = 1
     finally:
-         grass.run_command('g.remove', flags='f', type='rast',
+         grass.run_command('g.remove', flags='f', type='raster',
                            name='MASK', quiet=True, stderr=nuldev)
 
     sys.exit(exitcode)

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

@@ -95,31 +95,31 @@ def main():
                           option='add', input=input, out=input_tmp,
                           quiet=quiet)
     except CalledModuleError:
-        grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
-                          flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          name=input_tmp, quiet=quiet)
         grass.fatal(_("Error creating layer 2"))
     try:
         grass.run_command('v.db.addtable', map=input_tmp, layer="2",
                           columns="left integer,right integer",
                           quiet=quiet)
     except CalledModuleError:
-        grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
-                          flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          name=input_tmp, quiet=quiet)
         grass.fatal(_("Error creating new table for layer 2"))
     try:
         grass.run_command('v.to.db', map=input_tmp, option="sides",
                           columns="left,right", layer="2", quiet=quiet)
     except CalledModuleError:
-        grass.run_command('g.remove', type='vect', name=input_tmp, quiet=quiet,
-                          flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          name=input_tmp, quiet=quiet)
         grass.fatal(_("Error populating new table for layer 2"))
     try:
         grass.run_command('v.type', input=input_tmp, output=out_type,
                           from_type='boundary', to_type='line',
                           quiet=quiet, layer="2")
     except CalledModuleError:
-        grass.run_command('g.remove', type='vect', name=remove_names,
-                          quiet=quiet, flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          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')
@@ -134,8 +134,8 @@ def main():
                               type='centroid', layer=2, quiet=quiet,
                               cats='{mi}-{ma}'.format(mi=min_cat, ma=max_cat))
         except CalledModuleError:
-            grass.run_command('g.remove', type='vect', name=remove_names,
-                              quiet=quiet, flags='f')
+            grass.run_command('g.remove', flags='f', type='vector',
+                              name=remove_names, quiet=quiet)
             grass.fatal(_("Error removing centroids"))
 
     try:
@@ -144,8 +144,8 @@ def main():
             grass.run_command('v.db.droptable', map=out_type, layer=1,
                               flags='f', quiet=True)
         except CalledModuleError:
-            grass.run_command('g.remove', type='vect', name=remove_names,
-                              quiet=quiet, flags='f')
+            grass.run_command('g.remove', flags='f', type='vector',
+                              name=remove_names, quiet=quiet)
             grass.fatal(_("Error removing table from layer 1"))
     # TODO: when this except is happaning, it seems that never, so it seems wrong
     except:
@@ -155,14 +155,14 @@ def main():
                           output=output, layer="2,1", quiet=quiet,
                           overwrite=overwrite)
     except CalledModuleError:
-        grass.run_command('g.remove', type='vect', name=remove_names,
-                          quiet=quiet, flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          name=remove_names, quiet=quiet)
         grass.fatal(_("Error adding categories"))
-    grass.run_command('g.remove', type='vect', name=remove_names, quiet=quiet,
-                      flags='f')
+    grass.run_command('g.remove', flags='f', type='vector',
+                      name=remove_names, quiet=quiet)
     if point:
-        grass.run_command('g.remove', type='vect', name=out_temp, quiet=quiet,
-                          flags='f')
+        grass.run_command('g.remove', flags='f', type='vector',
+                          name=out_temp, quiet=quiet)
 
 
 if __name__ == "__main__":

scripts/v.unpack/v.unpack.py

@@ -91,7 +91,8 @@ def main():
         grass.fatal(_("Vector map <%s> already exists") % map_name)
     elif overwrite == '1' and gfile['file']:
         grass.warning(_("Vector map <%s> already exists and will be overwritten") % map_name)
-        grass.run_command('g.remove', quiet=True, flags='f', type='vect', name=map_name)
+        grass.run_command('g.remove', flags='f', quiet=True, type='vector',
+                          name=map_name)
         shutil.rmtree(new_dir, True)
 
     # extract data

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

@@ -501,7 +501,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", name=map.get_name(), quiet=True)
+            grass.run_command("g.remove", flags='f', type="raster", name=map.get_name(), quiet=True)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

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

@@ -186,7 +186,7 @@ def main():
             else:
                 names += ",%s" % (map.get_name())
 
-        grass.run_command("g.remove", flags='f', type='rast', name=names, quiet=True)
+        grass.run_command("g.remove", flags='f', type='raster', name=names, quiet=True)
 
     dbif.close()
 

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

@@ -146,8 +146,8 @@ def main():
             count += 1
 
     if use_granularity:
-        grass.run_command("g.remove", flags='f', type='rast', name=null_map)
-    grass.run_command("g.remove", flags='f', type='rast', name=map_name)
+        grass.run_command("g.remove", flags='f', type='raster', name=null_map)
+    grass.run_command("g.remove", flags='f', type='raster', name=map_name)
 
 if __name__ == "__main__":
     options, flags = grass.parser()

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

@@ -151,7 +151,7 @@ def main():
         except CalledModuleError:
             grass.fatal(_("Unable to create 3D raster map <%s>" % output))
 
-    grass.run_command("g.remove", flags='f', type='rast', name=null_map)
+    grass.run_command("g.remove", flags='f', type='raster', name=null_map)
 
     title = _("Space time voxel cube")
     descr = _("This space time voxel cube was created with t.rast.to.rast3")

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

@@ -68,7 +68,7 @@ class TestSTRDSToRast3(TestCase):
         """Remove generated data"""
         #self.runModule("t.remove",  flags="rf",  type="strds",  
         #                           inputs="precip_i,precip_f,precip_d")
-        #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
+        #self.runModule('g.remove', type='raster', pattern='prec_*', flags='f')
         self.del_temp_region()
 
     def otest_3m(self):
@@ -257,13 +257,13 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def tearDown(self):
         """Remove generated data"""
         #self.runModule("t.remove",  flags="rf",  type="strds", inputs="precip_d")
-        #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
+        #self.runModule('g.remove', type='raster', pattern='prec_*', flags='f')
         self.del_temp_region()
 
     def otest_years(self):
         """Convert STRDS into 3d raster map, granularity5 years"""
 
-        self.runModule("t.register", flags="i",  type="rast",  input="precip_d",  
+        self.runModule("t.register", flags="i",  type="raster",  input="precip_d",  
                        maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",  
                        start="2000-01-01", increment="5 years")
 
@@ -291,7 +291,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def otest_months(self):
         """Convert STRDS into 3d raster map, granularity 6 months"""
 
-        self.runModule("t.register", flags="i",  type="rast",  input="precip_d",  
+        self.runModule("t.register", flags="i",  type="raster",  input="precip_d",  
                        maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",  
                        start="2000-01-01", increment="6 months")
 
@@ -319,7 +319,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def otest_days(self):
         """Convert STRDS into 3d raster map, granularity 7 days"""
 
-        self.runModule("t.register", flags="i",  type="rast",  input="precip_d",  
+        self.runModule("t.register", flags="i",  type="raster",  input="precip_d",  
                        maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",  
                        start="2000-01-01", increment="7 days")
 
@@ -348,7 +348,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def otest_hours(self):
         """Convert STRDS into 3d raster map, granularity 7 days"""
 
-        self.runModule("t.register", flags="i",  type="rast",  input="precip_d",  
+        self.runModule("t.register", flags="i",  type="raster",  input="precip_d",  
                        maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",  
                        start="2000-01-01", increment="3 hours")
 
@@ -377,7 +377,7 @@ class TestSTRDSToRast3MultiGran(TestCase):
     def otest_minutes(self):
         """Convert STRDS into 3d raster map, granularity 7 days"""
 
-        self.runModule("t.register", flags="i",  type="rast",  input="precip_d",  
+        self.runModule("t.register", flags="i",  type="raster",  input="precip_d",  
                        maps="prec_1d,prec_2d,prec_3d,prec_4d,prec_5d,prec_6d",  
                        start="2000-01-01", increment="17 minutes")
 

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

@@ -188,7 +188,7 @@ def main():
 
                 if aggreagated_map_name:
                     try:
-                        grass.run_command("g.remove", flags='f', type='rast',
+                        grass.run_command("g.remove", flags='f', type='raster',
                                           name=aggreagated_map_name)
                     except CalledModuleError:
                         dbif.close()

tools/thumbnails.py

@@ -30,10 +30,10 @@ def cleanup():
     if tmp_img:
         grass.try_remove(tmp_img)
     if tmp_grad_rel:
-        grass.run_command('g.remove', flags = 'f', type = 'rast',
+        grass.run_command('g.remove', flags = 'f', type = 'raster',
                           name = tmp_grad_rel, quiet = True)
     if tmp_grad_abs:
-        grass.run_command('g.remove', flags = 'f', type = 'rast',
+        grass.run_command('g.remove', flags = 'f', type = 'raster',
                           name = tmp_grad_abs, quiet = True)
 
 # def rotate(src, dst):