rename env.py to functions.py

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53978 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/python/pygrass/__init__.py

@@ -9,13 +9,13 @@ _libgis.G_gisinit('')
 import os as _os
 import sys as _sys
 
-_pygrasspath = _os.path.dirname(_os.path.realpath( __file__ )).split(_os.sep)
+_pygrasspath = _os.path.dirname(_os.path.realpath(__file__)).split(_os.sep)
 
-_sys.path.append(_os.path.join(_os.sep,*_pygrasspath[:-1]))
+_sys.path.append(_os.path.join(_os.sep, *_pygrasspath[:-1]))
 
 import region
 import raster
 import vector
 import modules
 import errors
-import env
+import functions

lib/python/pygrass/raster/__init__.py

@@ -24,7 +24,7 @@ import grass.lib.rowio as librowio
 #
 from pygrass.errors import OpenError, must_be_open
 from pygrass.region import Region
-import pygrass.env as env
+from pygrass import functions
 
 #
 # import raster classes
@@ -661,7 +661,7 @@ class RasterNumpy(np.memmap, RasterAbstractBase):
         """
         if not region:
             region = Region()
-        x, y = env.coor2pixel(point.coords(), region)
+        x, y = functions.coor2pixel(point.coords(), region)
         return self[x][y]
 
 

lib/python/pygrass/raster/abstract.py

@@ -21,7 +21,7 @@ import grass.lib.raster as libraster
 #
 # import pygrass modules
 #
-import pygrass.env as env
+import pygrass as functions
 from pygrass.region import Region
 from pygrass.errors import must_be_open
 
@@ -122,7 +122,7 @@ class RasterAbstractBase(object):
     def _set_name(self, newname):
         """Private method to change the Raster name"""
         #import pdb; pdb.set_trace()
-        cleanname = env.clean_map_name(newname)
+        cleanname = functions.clean_map_name(newname)
         if self.exist():
             self.rename(cleanname)
         self._name = cleanname
@@ -212,7 +212,7 @@ class RasterAbstractBase(object):
 
         call the C function `G_find_raster`."""
         if self.name:
-            self.mapset = env.get_mapset_raster(self.name, self.mapset)
+            self.mapset = functions.get_mapset_raster(self.name, self.mapset)
         else:
             return False
         if self.mapset:
@@ -258,7 +258,7 @@ class RasterAbstractBase(object):
     def rename(self, newname):
         """Rename the map"""
         if self.exist():
-            env.rename(self.name, newname, 'rast')
+            functions.rename(self.name, newname, 'rast')
         self._name = newname
 
     def set_from_rast(self, rastname='', mapset=''):
@@ -292,7 +292,7 @@ class RasterAbstractBase(object):
         """
         if not region:
             region = Region()
-        x, y = env.coor2pixel(point.coords(), region)
+        x, y = functions.coor2pixel(point.coords(), region)
         line = self.get_row(int(x))
         return line[int(y)]
 

lib/python/pygrass/vector/abstract.py

@@ -9,16 +9,15 @@ import datetime
 import grass.lib.vector as libvect
 from vector_type import MAPTYPE
 
-import pygrass.env as env
+from pygrass import functions
 from pygrass.errors import GrassError, OpenError, must_be_open
 from table import DBlinks
 
-
-
 #=============================================
 # VECTOR ABSTRACT CLASS
 #=============================================
 
+
 class Info(object):
     """Basic vector info.
     To get access to the vector info the map must be opened. ::
@@ -201,7 +200,7 @@ class Info(object):
     def rename(self, newname):
         """Rename the map"""
         if self.exist():
-            env.rename(self.name, newname, 'vect')
+            functions.rename(self.name, newname, 'vect')
         self._name = newname
 
     def is_3D(self):
@@ -209,7 +208,7 @@ class Info(object):
 
     def exist(self):
         if self._name:
-            self.mapset = env.get_mapset_vector(self._name, self.mapset)
+            self.mapset = functions.get_mapset_vector(self._name, self.mapset)
         else:
             return False
         if self.mapset:
@@ -271,7 +270,7 @@ class Info(object):
         """Remove vector map"""
         if self.is_open():
             self.close()
-        env.remove(vect=self.name)
+        functions.remove(vect=self.name)
 
     def build(self):
         """Close the vector map and build vector Topology"""