[GRASS-SVN] r45900 - in grass/branches/develbranch_6: gui/wxpython/gui_modules lib/python/ctypes

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-04-10 15:39:47 -0700 (Sun, 10 Apr 2011)
New Revision: 45900

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdigit.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdriver.py
   grass/branches/develbranch_6/lib/python/ctypes/Makefile
   grass/branches/develbranch_6/lib/python/ctypes/__init__.py
Log:
ctypes: grass module renamed to gis (follow library naming conventions)
	(merge r45892 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py	2011-04-10 22:38:23 UTC (rev 45899)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxnviz.py	2011-04-10 22:39:47 UTC (rev 45900)
@@ -22,7 +22,7 @@
 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 *

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdigit.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdigit.py	2011-04-10 22:38:23 UTC (rev 45899)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdigit.py	2011-04-10 22:39:47 UTC (rev 45900)
@@ -24,7 +24,7 @@
 
 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 *

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdriver.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdriver.py	2011-04-10 22:38:23 UTC (rev 45899)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxvdriver.py	2011-04-10 22:39:47 UTC (rev 45900)
@@ -24,7 +24,7 @@
 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 *
 

Modified: grass/branches/develbranch_6/lib/python/ctypes/Makefile
===================================================================
--- grass/branches/develbranch_6/lib/python/ctypes/Makefile	2011-04-10 22:38:23 UTC (rev 45899)
+++ grass/branches/develbranch_6/lib/python/ctypes/Makefile	2011-04-10 22:39:47 UTC (rev 45900)
@@ -10,11 +10,11 @@
 DOXNAME=
 DOXINPUT=grasspython.dox
 
-MODULES = date grass gmath proj imagery vector display stats \
+MODULES = date gis gmath proj imagery vector display stats \
 	dbmi g3d arraystats cluster trans vedit ogsf nviz
 
 date_LIBS       = $(DATETIMELIB)
-grass_LIBS      = $(GISLIB)
+gis_LIBS      = $(GISLIB)
 gmath_LIBS      = $(GMATHLIB)
 proj_LIBS       = -l$(GPROJ_LIBNAME) $(GISLIB)
 imagery_LIBS    = $(IMAGERYLIB)
@@ -31,7 +31,7 @@
 nviz_LIBS       = $(NVIZLIB)
 
 date_HDRS       = datetime.h P_datetime.h
-grass_HDRS      = gis.h gisdefs.h
+gis_HDRS        = gis.h gisdefs.h
 gmath_HDRS      = gmath.h
 proj_HDRS       = gprojects.h
 imagery_HDRS    = imagery.h imagedefs.h

Modified: grass/branches/develbranch_6/lib/python/ctypes/__init__.py
===================================================================
--- grass/branches/develbranch_6/lib/python/ctypes/__init__.py	2011-04-10 22:38:23 UTC (rev 45899)
+++ grass/branches/develbranch_6/lib/python/ctypes/__init__.py	2011-04-10 22:39:47 UTC (rev 45900)
@@ -1,5 +1,5 @@
 import date
-import grass
+import gis
 import gmath
 import proj
 import imagery