[GRASS-SVN] r58974 - in grass/trunk: lib/python/temporal temporal/t.vect.mapcalc

[svn_grass at osgeo.org]

Author: huhabla
Date: 2014-02-09 14:12:07 -0800 (Sun, 09 Feb 2014)
New Revision: 58974

Modified:
   grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
   grass/trunk/lib/python/temporal/temporal_raster_algebra.py
   grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py
   grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py
Log:
t.vect.mapcalc update


Modified: grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py	2014-02-09 21:36:48 UTC (rev 58973)
+++ grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py	2014-02-09 22:12:07 UTC (rev 58974)
@@ -11,6 +11,7 @@
 
 """
 
+import grass.pygrass.modules as pygrass
 from temporal_raster_base_algebra import *
 
 ###############################################################################

Modified: grass/trunk/lib/python/temporal/temporal_raster_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster_algebra.py	2014-02-09 21:36:48 UTC (rev 58973)
+++ grass/trunk/lib/python/temporal/temporal_raster_algebra.py	2014-02-09 22:12:07 UTC (rev 58974)
@@ -53,6 +53,7 @@
 @endcode
 """
 
+import grass.pygrass.modules as pygrass
 from temporal_raster_base_algebra import *
 
 ###############################################################################

Modified: grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py	2014-02-09 21:36:48 UTC (rev 58973)
+++ grass/trunk/lib/python/temporal/temporal_raster_base_algebra.py	2014-02-09 22:12:07 UTC (rev 58974)
@@ -96,7 +96,6 @@
 @endcode
 """
 
-import grass.pygrass.modules as pygrass
 from temporal_raster_operator import *
 from temporal_algebra import *
 

Modified: grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py	2014-02-09 21:36:48 UTC (rev 58973)
+++ grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py	2014-02-09 22:12:07 UTC (rev 58974)
@@ -43,7 +43,7 @@
 #% description: Activate spatial topology.
 #%end
 
-import grass.script as grass
+import grass.script
 import grass.temporal as tgis
 import sys
 
@@ -58,13 +58,13 @@
         import ply.lex as lex
         import ply.yacc as yacc
     except:
-        grass.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules."))
+        grass.script.fatal(_("Please install PLY (Lex and Yacc Python implementation) to use the temporal algebra modules."))
 
     tgis.init(True)
     p = tgis.TemporalVectorAlgebraParser(run = True, debug=False, spatial = spatial)
-    p.parse(expression, stdstype, basename)
+    p.parse(expression, basename, grass.script.overwrite())
 
 if __name__ == "__main__":
-    options, flags = grass.parser()
+    options, flags = grass.script.parser()
     sys.exit(main())