ソースを参照

wxgui: catch also TypeError when importing ctypes, see #305 (#324)

Martin Landa 5 年 前
コミット
bbdda53a86

+ 1 - 1
gui/wxpython/mapwin/buffered.py

@@ -51,7 +51,7 @@ from core.gthread import gThread
 try:
 try:
     import grass.lib.gis as gislib
     import grass.lib.gis as gislib
     haveCtypes = True
     haveCtypes = True
-except ImportError:
+except (ImportError, TypeError):
     haveCtypes = False
     haveCtypes = False
 
 
 
 

+ 5 - 2
gui/wxpython/nviz/wxnviz.py

@@ -41,7 +41,10 @@ except ImportError:
 
 
 import wx
 import wx
 
 
-from ctypes import *
+try:
+    from ctypes import *
+except KeyError as e:
+    print("wxnviz.py: {}".format(e), file=sys.stderr)
 
 
 try:
 try:
     WindowsError
     WindowsError
@@ -54,7 +57,7 @@ try:
     from grass.lib.ogsf import *
     from grass.lib.ogsf import *
     from grass.lib.nviz import *
     from grass.lib.nviz import *
     from grass.lib.raster import *
     from grass.lib.raster import *
-except (ImportError, WindowsError) as e:
+except (ImportError, WindowsError, TypeError) as e:
     print("wxnviz.py: {}".format(e), file=sys.stderr)
     print("wxnviz.py: {}".format(e), file=sys.stderr)
 
 
 from core.debug import Debug
 from core.debug import Debug

+ 1 - 1
gui/wxpython/vdigit/wxdigit.py

@@ -47,7 +47,7 @@ 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, WindowsError) as e:
+except (ImportError, WindowsError, TypeError) as e:
     print("wxdigit.py: {}".format(e), file=sys.stderr)
     print("wxdigit.py: {}".format(e), file=sys.stderr)
 
 
 class VDigitError:
 class VDigitError:

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

@@ -39,7 +39,7 @@ 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, WindowsError) as e:
+except (ImportError, WindowsError, TypeError) as e:
     print("wxdigit.py: {}".format(e), file=sys.stderr)
     print("wxdigit.py: {}".format(e), file=sys.stderr)
 
 
 log = None
 log = None