reorganized grass python interface, patch by cgsbob

rblazek · rblazek · commit befe25ce73f4 · 2009-06-16T06:17:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10936 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/scripts/qgis.db.connect-login.pg.py b/src/plugins/grass/scripts/qgis.db.connect-login.pg.py
@@ -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']
diff --git a/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py b/src/plugins/grass/scripts/qgis.v.out.ogr.pg.py
@@ -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']
