Browse Source

update pygrass to recent libgis
(merge https://trac.osgeo.org/grass/changeset/63869 from trunk)


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

Martin Landa 10 years ago
parent
commit
1d87e68f2b

+ 2 - 2
lib/python/pygrass/gis/__init__.py

@@ -148,7 +148,7 @@ class Gisdbase(object):
 
     # 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 @@ class Location(object):
         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

+ 1 - 1
lib/python/pygrass/utils.py

@@ -120,7 +120,7 @@ def getenv(env):
     'user1'
 
     """
-    return libgis.G__getenv(env)
+    return libgis.G_getenv_nofatal(env)
 
 
 def get_mapset_raster(mapname, mapset=''):

+ 1 - 1
lib/python/temporal/c_libraries_interface.py

@@ -156,7 +156,7 @@ def _available_mapsets(lock, conn, data):
     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":