瀏覽代碼

wxGUI: catch also WindowsError when unable to load GRASS libs

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72297 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 7 年之前
父節點
當前提交
32b0d9ceee
共有 3 個文件被更改,包括 15 次插入11 次删除
  1. 9 6
      gui/wxpython/nviz/wxnviz.py
  2. 4 3
      gui/wxpython/vdigit/wxdigit.py
  3. 2 2
      gui/wxpython/vdigit/wxdisplay.py

+ 9 - 6
gui/wxpython/nviz/wxnviz.py

@@ -43,12 +43,15 @@ import wx
 
 
 from ctypes import *
 from ctypes import *
 
 
-from grass.lib.gis import *
-from grass.lib.raster3d import *
-from grass.lib.vector import *
-from grass.lib.ogsf import *
-from grass.lib.nviz import *
-from grass.lib.raster import *
+try:
+    from grass.lib.gis import *
+    from grass.lib.raster3d import *
+    from grass.lib.vector import *
+    from grass.lib.ogsf import *
+    from grass.lib.nviz import *
+    from grass.lib.raster import *
+except (ImportError, WindowsError) as e:
+    print("wxnviz.py: {}".format(e), file=sys.stderr)
 
 
 from core.debug import Debug
 from core.debug import Debug
 from core.utils import _, autoCropImageFromFile
 from core.utils import _, autoCropImageFromFile

+ 4 - 3
gui/wxpython/vdigit/wxdigit.py

@@ -26,6 +26,8 @@ This program is free software under the GNU General Public License
 @author Martin Landa <landa.martin gmail.com>
 @author Martin Landa <landa.martin gmail.com>
 """
 """
 
 
+from __future__ import print_function
+
 import grass.script.core as grass
 import grass.script.core as grass
 
 
 from grass.pydispatch.signal import Signal
 from grass.pydispatch.signal import Signal
@@ -41,9 +43,8 @@ try:
     from grass.lib.vector import *
     from grass.lib.vector import *
     from grass.lib.vedit import *
     from grass.lib.vedit import *
     from grass.lib.dbmi import *
     from grass.lib.dbmi import *
-except ImportError:
-    pass
-
+except (ImportError, WindowsError) as e:
+    print("wxdigit.py: {}".format(e), file=sys.stderr)
 
 
 class VDigitError:
 class VDigitError:
 
 

+ 2 - 2
gui/wxpython/vdigit/wxdisplay.py

@@ -31,8 +31,8 @@ try:
     from grass.lib.gis import *
     from grass.lib.gis import *
     from grass.lib.vector import *
     from grass.lib.vector import *
     from grass.lib.vedit import *
     from grass.lib.vedit import *
-except ImportError:
-    pass
+except (ImportError, WindowsError) as e:
+    print("wxdigit.py: {}".format(e), file=sys.stderr)
 
 
 log = None
 log = None
 progress = None
 progress = None