[GRASS-SVN] r63626 - in grass/trunk: general/g.rename lib/manage lib/python/pygrass/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-12-19 12:29:57 -0800 (Fri, 19 Dec 2014)
New Revision: 63626

Modified:
   grass/trunk/general/g.rename/g.rename.html
   grass/trunk/lib/manage/option.c
   grass/trunk/lib/python/pygrass/gis/__init__.py
Log:
completion of r63624

Modified: grass/trunk/general/g.rename/g.rename.html
===================================================================
--- grass/trunk/general/g.rename/g.rename.html	2014-12-19 20:17:59 UTC (rev 63625)
+++ grass/trunk/general/g.rename/g.rename.html	2014-12-19 20:29:57 UTC (rev 63626)
@@ -23,8 +23,8 @@
        raster   raster map(s) to be renamed
     raster_3d   3D raster map(s) to be renamed
        vector   vector map(s) to be renamed
-    oldvector   old  (GRASS 5.0) vector map(s) to be renamed
-  asciivector   ASCII vector map(s) to be renamed
+   old_vector   old  (GRASS 5.0) vector map(s) to be renamed
+ ascii_vector   ASCII vector map(s) to be renamed
        labels   paint label file(s) to be renamed
        region   region definition(s) to be renamed
         group   imagery group(s) to be renamed

Modified: grass/trunk/lib/manage/option.c
===================================================================
--- grass/trunk/lib/manage/option.c	2014-12-19 20:17:59 UTC (rev 63625)
+++ grass/trunk/lib/manage/option.c	2014-12-19 20:29:57 UTC (rev 63626)
@@ -50,8 +50,8 @@
     if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "raster_3d") == 0)
 	p->guisection = _("Raster");
     else if (strcmp(p->key, "vector") == 0 ||
-             strcmp(p->key, "oldvector") == 0 ||
-	     strcmp(p->key, "asciivector") == 0)
+             strcmp(p->key, "old_vector") == 0 ||
+	     strcmp(p->key, "ascii_vector") == 0)
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
 	p->guisection = _("Region");

Modified: grass/trunk/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/trunk/lib/python/pygrass/gis/__init__.py	2014-12-19 20:17:59 UTC (rev 63625)
+++ grass/trunk/lib/python/pygrass/gis/__init__.py	2014-12-19 20:29:57 UTC (rev 63626)
@@ -18,8 +18,8 @@
 ETYPE = {'raster': libgis.G_ELEMENT_RASTER,
          'raster_3d': libgis.G_ELEMENT_RASTER3D,
          'vector': libgis.G_ELEMENT_VECTOR,
-         'oldvector': libgis.G_ELEMENT_OLDVECTOR,
-         'asciivector': libgis.G_ELEMENT_ASCIIVECTOR,
+         'old_vector': libgis.G_ELEMENT_OLDVECTOR,
+         'ascii_vector': libgis.G_ELEMENT_ASCIIVECTOR,
          'icon': libgis.G_ELEMENT_ICON,
          'labels': libgis.G_ELEMENT_LABEL,
          'sites': libgis.G_ELEMENT_SITE,
@@ -309,11 +309,11 @@
     def glist(self, type, pattern=None):
         """Return a list of grass types like:
 
-            * 'asciivector',
+            * 'ascii_vector',
             * 'group',
             * 'icon',
             * 'labels',
-            * 'oldvector',
+            * 'old_vector',
             * 'raster',
             * 'raster_3d',
             * 'region',