[QGIS Commit] r10936 - trunk/qgis/src/plugins/grass/scripts

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2009-06-16 02:17:13 -0400 (Tue, 16 Jun 2009)
New Revision: 10936

Modified:
   trunk/qgis/src/plugins/grass/scripts/qgis.db.connect-login.pg.py
   trunk/qgis/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py
Log:
reorganized grass python interface, patch by cgsbob

Modified: trunk/qgis/src/plugins/grass/scripts/qgis.db.connect-login.pg.py
===================================================================
--- trunk/qgis/src/plugins/grass/scripts/qgis.db.connect-login.pg.py	2009-06-16 04:41:18 UTC (rev 10935)
+++ trunk/qgis/src/plugins/grass/scripts/qgis.db.connect-login.pg.py	2009-06-16 06:17:13 UTC (rev 10936)
@@ -73,9 +73,11 @@
 import os
 import string
 try:
+    from grass.script import core as grass
+except ImportError:
     import grass
 except:
-    raise Exception ("Cannot find 'grass' Python module. Python is supported by GRASS from version 6.4" )
+    raise Exception ("Cannot find 'grass' Python module. Python is supported by GRASS from version >= 6.4" )
 
 def main():
     host = options['host']

Modified: trunk/qgis/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py
===================================================================
--- trunk/qgis/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py	2009-06-16 04:41:18 UTC (rev 10935)
+++ trunk/qgis/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py	2009-06-16 06:17:13 UTC (rev 10936)
@@ -107,9 +107,11 @@
 import os
 import string
 try:
+    from grass.script import core as grass
+except ImportError:
     import grass
 except:
-    raise Exception ("Cannot find 'grass' Python module. Python is supported by GRASS from version 6.4" )
+    raise Exception ("Cannot find 'grass' Python module. Python is supported by GRASS from version >= 6.4" )
 
 def main():
     input = options['input']