Pārlūkot izejas kodu

ctypes: grass module renamed to gis (follow library naming conventions)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@45892 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 gadi atpakaļ
vecāks
revīzija
5d42bd9178

+ 1 - 1
doc/python/m.distance.py

@@ -63,7 +63,7 @@ def main():
     #   check with "import sys; sys.path"
     # or:
     sys.path.append("/usr/local/grass-7.0.svn/etc/python")
-    from grass.lib import grass as g7lib
+    from grass.lib import gis as g7lib
  
     # for passing pointers
     import Numeric

+ 1 - 1
doc/python/raster_example_ctypes.py

@@ -18,7 +18,7 @@ cols=5`
 import os
 import sys
 
-from grass.lib.grass  import *
+from grass.lib.gis    import *
 from grass.lib.raster import *
 
 # check if GRASS is running or not

+ 1 - 1
doc/python/vector_example_ctypes.py

@@ -7,7 +7,7 @@ interface
 
 import os, sys
 
-from grass.lib.grass  import *
+from grass.lib.gis    import *
 from grass.lib.vector import *
 
 if not os.environ.has_key("GISBASE"):

+ 1 - 1
gui/wxpython/gui_modules/wxnviz.py

@@ -22,7 +22,7 @@ import sys
 from threading import Thread
 
 from ctypes import *
-from grass.lib.grass import *
+from grass.lib.gis   import *
 from grass.lib.g3d   import *
 from grass.lib.ogsf  import *
 from grass.lib.nviz  import *

+ 1 - 1
gui/wxpython/gui_modules/wxvdigit.py

@@ -24,7 +24,7 @@ from preferences import globalSettings as UserSettings
 
 from wxvdriver   import DisplayDriver
 
-from grass.lib.grass  import *
+from grass.lib.gis    import *
 from grass.lib.vector import *
 from grass.lib.vedit  import *
 from grass.lib.dbmi   import *

+ 1 - 1
gui/wxpython/gui_modules/wxvdriver.py

@@ -24,7 +24,7 @@ import wx
 from debug import Debug
 from preferences import globalSettings as UserSettings
 
-from grass.lib.grass  import *
+from grass.lib.gis    import *
 from grass.lib.vector import *
 from grass.lib.vedit  import *
 

+ 3 - 3
lib/python/ctypes/Makefile

@@ -9,11 +9,11 @@ include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 DOXNAME=
 DOXINPUT=grasspython.dox
 
-MODULES = date grass raster gmath proj imagery vector display stats \
+MODULES = date gis raster gmath proj imagery vector display stats \
 	dbmi g3d arraystats cluster trans vedit ogsf nviz
 
 date_LIBS       = $(DATETIMELIB)
-grass_LIBS      = $(GISLIB)
+gis_LIBS      = $(GISLIB)
 raster_LIBS     = $(RASTERLIB)
 gmath_LIBS      = $(GMATHLIB)
 proj_LIBS       = $(GPROJLIB)
@@ -31,7 +31,7 @@ ogsf_LIBS       = $(OGSFLIB)
 nviz_LIBS       = $(NVIZLIB)
 
 date_HDRS       = datetime.h P_datetime.h
-grass_HDRS      = gis.h gisdefs.h
+gis_HDRS        = gis.h gisdefs.h
 raster_HDRS     = raster.h rasterdefs.h
 gmath_HDRS      = gmath.h
 proj_HDRS       = gprojects.h

+ 1 - 1
lib/python/ctypes/__init__.py

@@ -1,5 +1,5 @@
 import date
-import grass
+import gis
 import raster
 import gmath
 import proj