[GRASS-SVN] r63869 - in grass/trunk/lib/python: pygrass pygrass/gis temporal

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 12:24:38 -0800 (Mon, 29 Dec 2014)
New Revision: 63869

Modified:
   grass/trunk/lib/python/pygrass/gis/__init__.py
   grass/trunk/lib/python/pygrass/utils.py
   grass/trunk/lib/python/temporal/c_libraries_interface.py
Log:
update pygrass to recent libgis


Modified: grass/trunk/lib/python/pygrass/gis/__init__.py
===================================================================
--- grass/trunk/lib/python/pygrass/gis/__init__.py	2014-12-29 20:22:41 UTC (rev 63868)
+++ grass/trunk/lib/python/pygrass/gis/__init__.py	2014-12-29 20:24:38 UTC (rev 63869)
@@ -148,7 +148,7 @@
 
     # TODO remove or complete this function
     def new_location(self):
-        if libgis.G__make_location() != 0:
+        if libgis.G_make_location() != 0:
             raise GrassError("Cannot create new location")
 
     def locations(self):
@@ -240,7 +240,7 @@
         mapsets = [mapset for mapset in self]
         if permissions:
             mapsets = [mapset for mapset in mapsets
-                       if libgis.G__mapset_permissions(mapset)]
+                       if libgis.G_mapset_permissions(mapset)]
         if pattern:
             return fnmatch.filter(mapsets, pattern)
         return mapsets

Modified: grass/trunk/lib/python/pygrass/utils.py
===================================================================
--- grass/trunk/lib/python/pygrass/utils.py	2014-12-29 20:22:41 UTC (rev 63868)
+++ grass/trunk/lib/python/pygrass/utils.py	2014-12-29 20:24:38 UTC (rev 63869)
@@ -120,7 +120,7 @@
     'user1'
 
     """
-    return libgis.G__getenv(env)
+    return libgis.G_getenv_nofatal(env)
 
 
 def get_mapset_raster(mapname, mapset=''):

Modified: grass/trunk/lib/python/temporal/c_libraries_interface.py
===================================================================
--- grass/trunk/lib/python/temporal/c_libraries_interface.py	2014-12-29 20:22:41 UTC (rev 63868)
+++ grass/trunk/lib/python/temporal/c_libraries_interface.py	2014-12-29 20:24:38 UTC (rev 63869)
@@ -156,7 +156,7 @@
     while mapsets[count]:
         char_list = ""
         mapset = mapsets[count]
-        if libgis.G__mapset_permissions(mapset) > 0:
+        if libgis.G_mapset_permissions(mapset) > 0:
             count += 1
             c = 0
             while mapset[c] != "\x00":