Browse Source

update g.list/g.remove calls to use new element names (https://trac.osgeo.org/grass/ticket/2409) (trunk, https://trac.osgeo.org/grass/changeset/63652)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63653 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 years ago
parent
commit
2b9d1bd4f8

+ 1 - 1
lib/python/pygrass/modules/shortcuts.py

@@ -20,7 +20,7 @@ class MetaModule(object):
        'g.list'
        'g.list'
        >>> g_list.required
        >>> g_list.required
        ['type']
        ['type']
-       >>> g_list.inputs.type = 'rast'
+       >>> g_list.inputs.type = 'raster'
        >>> g_list.stdout_ = -1
        >>> g_list.stdout_ = -1
        >>> g_list.run()
        >>> g_list.run()
        Module('g.list')
        Module('g.list')

+ 1 - 1
lib/python/pygrass/vector/testsuite/test_vector3d.py

@@ -61,7 +61,7 @@ class VectorTopo3DTestCase(TestCase):
         """Remove the generated vector map, if exist"""
         """Remove the generated vector map, if exist"""
         mset = get_mapset_vector(cls.tmpname, mapset='')
         mset = get_mapset_vector(cls.tmpname, mapset='')
         if mset:
         if mset:
-            run_command("g.remove", flags='f', type='vect', name=cls.tmpname)
+            run_command("g.remove", flags='f', type='vector', name=cls.tmpname)
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 1 - 1
lib/python/script/raster.py

@@ -122,7 +122,7 @@ def mapcalc_start(exp, quiet=False, verbose=False, overwrite=False,
     0
     0
     >>> p2.wait()
     >>> p2.wait()
     1
     1
-    >>> run_command('g.remove', flags='f', type='rast', name=output)
+    >>> run_command('g.remove', flags='f', type='raster', name=output)
 
 
     :param str exp: expression
     :param str exp: expression
     :param bool quiet: True to run quietly (<tt>--q</tt>)
     :param bool quiet: True to run quietly (<tt>--q</tt>)

+ 3 - 3
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
 when test finishes. It could test if everything which was expected
 to be created was created if it would check all outputs properly.
 to be created was created if it would check all outputs properly.
 
 
->>> run_command('g.remove', flags='f', type='rast', name='test')
+>>> run_command('g.remove', flags='f', type='raster', name='test')
 0
 0
->>> run_command('g.remove', flags='f', type='rast', name='test_14')
+>>> run_command('g.remove', flags='f', type='raster', name='test_14')
 0
 0
->>> run_command('g.remove', flags='f', type='rast', name='test_d')
+>>> run_command('g.remove', flags='f', type='raster', name='test_d')
 0
 0

+ 1 - 1
scripts/r3.in.xyz/r3.in.xyz.py

@@ -307,7 +307,7 @@ def main():
     grass.verbose(_("Assembling 3D cube ..."))
     grass.verbose(_("Assembling 3D cube ..."))
 
 
     #input order: lower most strata first
     #input order: lower most strata first
-    slices = grass.read_command('g.list', type='rast', sep=',',
+    slices = grass.read_command('g.list', type='raster', sep=',',
                                 pattern='tmp.r3xyz.%d.*' % os.getpid()).rstrip(os.linesep)
                                 pattern='tmp.r3xyz.%d.*' % os.getpid()).rstrip(os.linesep)
     grass.debug(slices)
     grass.debug(slices)